chore: use latest master in dogfooding app and fix CI (#127)

This commit is contained in:
Sasha 2025-04-18 16:41:38 +02:00 committed by GitHub
parent 57d8c27b25
commit d51ed4ce55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 440 additions and 353 deletions

View File

@ -31,9 +31,9 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install NodeJS - name: Install NodeJS
uses: actions/setup-node@v2 uses: actions/setup-node@v4
with: with:
node-version: "18" node-version: "20"
cache: "npm" cache: "npm"
cache-dependency-path: "**/package-lock.json" cache-dependency-path: "**/package-lock.json"

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
"dependencies": { "dependencies": {
"@libp2p/crypto": "^5.0.5", "@libp2p/crypto": "^5.0.5",
"@multiformats/multiaddr": "^12.3.1", "@multiformats/multiaddr": "^12.3.1",
"@waku/sdk": "0.0.30-0e49a1e.0", "@waku/sdk": "0.0.31-3038c48.0",
"libp2p": "^2.1.10", "libp2p": "^2.1.10",
"protobufjs": "^7.3.0", "protobufjs": "^7.3.0",
"uint8arrays": "^5.1.0" "uint8arrays": "^5.1.0"

View File

@ -1,7 +1,5 @@
import { import {
createLightNode, createLightNode,
createEncoder,
createDecoder,
DecodedMessage, DecodedMessage,
LightNode, LightNode,
utils, utils,
@ -19,7 +17,6 @@ import {
generateRandomNumber, generateRandomNumber,
sha256, sha256,
buildExtraData, buildExtraData,
DEFAULT_EXTRA_DATA_STR,
} from "./util"; } from "./util";
const DEFAULT_CONTENT_TOPIC = "/js-waku-examples/1/message-ratio/utf8"; const DEFAULT_CONTENT_TOPIC = "/js-waku-examples/1/message-ratio/utf8";
@ -51,16 +48,18 @@ async function wakuNode(): Promise<LightNode> {
const node = await createLightNode({ const node = await createLightNode({
defaultBootstrap: false, defaultBootstrap: false,
numPeersToUse: 2,
networkConfig: { networkConfig: {
clusterId: 42, clusterId: 42,
shards: [0] shards: [0]
}, },
numPeersToUse: 2,
libp2p: { libp2p: {
privateKey, privateKey,
}, },
}); });
(window as any).waku = node;
await node.dial("/dns4/waku-test.bloxy.one/tcp/8095/wss/p2p/16Uiu2HAmSZbDB7CusdRhgkD81VssRjQV5ZH13FbzCGcdnbbh6VwZ"); await node.dial("/dns4/waku-test.bloxy.one/tcp/8095/wss/p2p/16Uiu2HAmSZbDB7CusdRhgkD81VssRjQV5ZH13FbzCGcdnbbh6VwZ");
await node.dial("/dns4/vps-aaa00d52.vps.ovh.ca/tcp/8000/wss/p2p/16Uiu2HAm9PftGgHZwWE3wzdMde4m3kT2eYJFXLZfGoSED3gysofk"); await node.dial("/dns4/vps-aaa00d52.vps.ovh.ca/tcp/8000/wss/p2p/16Uiu2HAm9PftGgHZwWE3wzdMde4m3kT2eYJFXLZfGoSED3gysofk");
await node.dial("/dns4/waku.fryorcraken.xyz/tcp/8000/wss/p2p/16Uiu2HAmMRvhDHrtiHft1FTUYnn6cVA8AWVrTyLUayJJ3MWpUZDB"); await node.dial("/dns4/waku.fryorcraken.xyz/tcp/8000/wss/p2p/16Uiu2HAmMRvhDHrtiHft1FTUYnn6cVA8AWVrTyLUayJJ3MWpUZDB");
@ -70,7 +69,6 @@ async function wakuNode(): Promise<LightNode> {
export async function app(telemetryClient: TelemetryClient) { export async function app(telemetryClient: TelemetryClient) {
const node = await wakuNode(); const node = await wakuNode();
(window as any).waku = node;
console.log("DEBUG: your peer ID is:", node.libp2p.peerId.toString()); console.log("DEBUG: your peer ID is:", node.libp2p.peerId.toString());
@ -78,12 +76,8 @@ export async function app(telemetryClient: TelemetryClient) {
await node.waitForPeers(); await node.waitForPeers();
const peerId = node.libp2p.peerId.toString(); const peerId = node.libp2p.peerId.toString();
const encoder = createEncoder({ const encoder = node.createEncoder({
contentTopic: DEFAULT_CONTENT_TOPIC, contentTopic: DEFAULT_CONTENT_TOPIC
pubsubTopicShardInfo: {
clusterId: 42,
shard: 0,
}
}); });
node.libp2p.addEventListener("peer:discovery", async (event) => { node.libp2p.addEventListener("peer:discovery", async (event) => {
@ -166,7 +160,7 @@ export async function app(telemetryClient: TelemetryClient) {
}; };
const startFilterSubscription = async () => { const startFilterSubscription = async () => {
const decoder = createDecoder(DEFAULT_CONTENT_TOPIC, { clusterId: 42, shard: 0 }); const decoder = node.createDecoder({ contentTopic: DEFAULT_CONTENT_TOPIC });
const subscriptionCallback = async (message: DecodedMessage) => { const subscriptionCallback = async (message: DecodedMessage) => {
const decodedMessage: any = ProtoSequencedMessage.decode( const decodedMessage: any = ProtoSequencedMessage.decode(

View File

@ -1,4 +1,3 @@
import { Peer } from "@libp2p/interface";
import type { LightNode } from "@waku/sdk"; import type { LightNode } from "@waku/sdk";
export const generateRandomNumber = (): number => { export const generateRandomNumber = (): number => {
@ -19,7 +18,7 @@ export const DEFAULT_EXTRA_DATA_STR = JSON.stringify(DEFAULT_EXTRA_DATA);
export const buildExtraData = async (node: LightNode, peerId: string): Promise<string> => { export const buildExtraData = async (node: LightNode, peerId: string): Promise<string> => {
let extraData = { ...DEFAULT_EXTRA_DATA }; let extraData = { ...DEFAULT_EXTRA_DATA };
const peer: Peer = (await node.libp2p.peerStore.all()).find(p => p.id.toString() === peerId); const peer = (await node.libp2p.peerStore.all()).find(p => p.id.toString() === peerId);
if (!peer || peerId === node.libp2p.peerId.toString()) { if (!peer || peerId === node.libp2p.peerId.toString()) {
return JSON.stringify(extraData); return JSON.stringify(extraData);