Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add store nodes from shards.test fleet #529

Merged
merged 12 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
"smartStep": true,
"sourceMaps": true,
"env": {
"DEBUG": "*",
"DEBUG": "*,-vite*,-connect:*",
"DEBUG_HIDE_DATE": "0",
"DEBUG_COLORS": "1",
"VITE_NODE": "true"
},
"runtimeArgs": ["--preserve-symlinks"],
"outFiles": ["${workspaceFolder}/**/*.js"],
"resolveSourceMapLocations": ["**/*"]
"resolveSourceMapLocations": ["**/*"],
"outputCapture": "std"
},
{
"type": "node",
Expand Down
29 changes: 29 additions & 0 deletions packages/status-js/.scripts/debug/index.ts
felicio marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// yarn install
// cd packages/status-js/
// DEBUG="*,-vite*,-connect:*" DEBUG_HIDE_DATE="0" DEBUG_COLORS="1" VITE_NODE="true" yarn vite-node .scripts/debug/index.ts

import { createRequestClient } from '../../src/request-client/request-client'
import { deserializePublicKey } from '../../src/utils/deserialize-public-key'

const requestClient = await createRequestClient({ environment: 'test' })

process.once('SIGTERM', async () => {
await requestClient.stop()
})

process.once('SIGINT', async () => {
await requestClient.stop()
})

const deserializedPublicKey = deserializePublicKey(
// '0x0269e4e75683762fc5d8af53ee1d1656767b780519a5bd1ecb4bd34d482b100fd7'
// '0x029f196bbfef4fa6a5eb81dd802133a63498325445ca1af1d154b1bb4542955133'
// 'zQ3shf8EvhRKHSc3skgtupULuLdWh59S5czZkvS69P6rJ7aed'
felicio marked this conversation as resolved.
Show resolved Hide resolved
// 'zQ3shVhrvjfYRfh6unhUpapUNuVHh7BAL3Qx3G7oh6wkYDM7s'
'zQ3shgz9XWZerfqsSpR2XKjfyiwtyiRNV6whj6BXREwnuLo5P'
)
const detail = await requestClient.fetchCommunityDescription(
deserializedPublicKey
)

debugger
6 changes: 3 additions & 3 deletions packages/status-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
"@bufbuild/protobuf": "1.4.2",
"@libp2p/bootstrap": "^9.0.10",
"@scure/base": "^1.1.1",
"@waku/message-encryption": "^0.0.23",
"@waku/sdk": "^0.0.21",
"@waku/message-encryption": "^0.0.24",
"@waku/sdk": "^0.0.22",
"ethereum-cryptography": "^1.0.3",
"ethers": "^6.2.1",
"multiformats": "^11.0.1"
},
"devDependencies": {
"@bufbuild/protoc-gen-es": "1.4.2",
"@status-im/eslint-config": "*",
"@waku/interfaces": "^0.0.20",
"@waku/interfaces": "^0.0.21",
"happy-dom": "^9.1.7"
},
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packages/status-js/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface ClientOptions {
* Public key of a community to join.
*/
publicKey: string
environment?: 'production' | 'test'
environment?: 'test' // 'production' | 'test'
felicio marked this conversation as resolved.
Show resolved Hide resolved
/**
* Custom storage for data persistance
* @default window.localStorage
Expand Down Expand Up @@ -132,7 +132,7 @@ class Client {
}

static async start(options: ClientOptions): Promise<Client> {
const { environment = 'production' } = options
const { environment = 'test' } = options

let waku: LightNode | undefined
let client: Client | undefined
Expand Down
28 changes: 7 additions & 21 deletions packages/status-js/src/consts/peers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,13 @@
// todo: use "dynamic" discovery protocol instead
// todo?: use a regional map together with an environment variable for the peer selection (e.g. `VERCEL_REGION`, but probably limited to Serverless Functions)
export const peers = {
production: [
// Nim
'/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC',
'/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D',
'/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb',
'/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8',
'/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV',
'/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg',
// Go
// '/dns4/node-01.ac-cn-hongkong-c.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwUKwy66nhcSFeW7y5qijNqXC4ZD3TaMMqnoEbh3wK2xU',
// '/dns4/node-01.do-ams3.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkyScd7DiwgMwzfw8CFFhznH3wRzciqEUfjDzn7vyimR8c',
// '/dns4/node-01.gc-us-central1-a.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmKTYnoPKebjWy63e1zPKiYRCQvm25W5mNSnCFE8EmzLga',
],
// production: [],
test: [
// Nim
'/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi',
'/dns4/node-01.do-ams3.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf',
'/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76',
// Go
// '/dns4/node-01.ac-cn-hongkong-c.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmBDbMWFiG9ki8sDw6fYtraSxo4oHU9HbuN43S2HVyq1FD',
// '/dns4/node-01.do-ams3.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9vnvCQgCDrynDK1h7GJoEZVGvnuzq84RyDQ3DEdXmcX7',
// '/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz',
'/dns4/store-01.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT',
// '/dns4/store-02.do-ams3.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9aDJPkhGxc2SFcEACTFdZ91Q5TJjp76qZEhq9iF59x7R',
// '/dns4/store-01.gc-us-central1-a.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmMELCo218hncCtTvC2Dwbej3rbyHQcR8erXNnKGei7WPZ',
// '/dns4/store-02.gc-us-central1-a.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJnVR7ZzFaYvciPVafUXuYGLHPzSUigqAmeNw9nJUVGeM',
// '/dns4/store-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2M7xs7cLPc3jamawkEqbr7cUJX11uvY7LxQ6WFUdUKUT',
// '/dns4/store-02.ac-cn-hongkong-c.shards.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9CQhsuwPR54q27kNj9iaQVfyRzTGKrhFmr94oD8ujU6P',
],
}
45 changes: 38 additions & 7 deletions packages/status-js/src/request-client/request-client.ts
felicio marked this conversation as resolved.
Show resolved Hide resolved
felicio marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ import type { ChannelInfo } from './map-channel'
import type { CommunityInfo } from './map-community'
import type { UserInfo } from './map-user'
import type { LightNode } from '@waku/interfaces'
import type { DecodedMessage } from '@waku/message-encryption/symmetric'

type DecodedMessage = NonNullable<
Awaited<ReturnType<ReturnType<typeof createDecoder>['fromProtoObj']>>
>

export interface RequestClientOptions {
environment?: 'production' | 'test'
environment?: 'test' // 'production' | 'test'
}

class RequestClient {
Expand All @@ -46,7 +49,7 @@ class RequestClient {
}

static async start(options: RequestClientOptions): Promise<RequestClient> {
const { environment = 'production' } = options
const { environment = 'test' } = options

let waku: LightNode | undefined
let client: RequestClient | undefined
Expand All @@ -58,8 +61,8 @@ class RequestClient {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
emitSelf: true,
pingKeepAlive: 0,
relayKeepAlive: 0,
// pingKeepAlive: 0,
// relayKeepAlive: 0,
libp2p: {
peerDiscovery: [
bootstrap({
Expand All @@ -70,6 +73,14 @@ class RequestClient {
}),
],
},
// pubsubTopics: [
// '/waku/2/rs/16/32',
// // '/waku/2/default-waku/proto'
// ],
shardInfo: {
clusterId: 16,
shards: [32],
felicio marked this conversation as resolved.
Show resolved Hide resolved
},
})
await waku.start()
await waitForRemotePeer(waku, [Protocols.Store], 10 * 1000)
Expand Down Expand Up @@ -150,7 +161,17 @@ class RequestClient {

let communityDescription: CommunityDescription | undefined = undefined
await this.waku.store.queryWithOrderedCallback(
[createDecoder(contentTopic, symmetricKey)],
[
createDecoder(
contentTopic,
symmetricKey,
// '/waku/2/rs/16/32'
{
clusterId: 16,
shard: 32,
}
),
],
wakuMessage => {
// handle
const message = this.handleWakuMessage(wakuMessage)
Expand Down Expand Up @@ -207,7 +228,17 @@ class RequestClient {
let contactCodeAdvertisement: ContactCodeAdvertisement | undefined =
undefined
await this.waku.store.queryWithOrderedCallback(
[createDecoder(contentTopic, symmetricKey)],
[
createDecoder(
contentTopic,
symmetricKey,
// '/waku/2/rs/16/32'
{
clusterId: 16,
shard: 32,
}
),
],
wakuMessage => {
// handle
const message = this.handleWakuMessage(wakuMessage)
Expand Down
Loading
Loading