status-im/js-waku
2
0
Fork 0
mirror of https://github.com/status-im/js-waku.git synced 2025-02-21 17:38:14 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade libp2p to 0.31.0-rc.3

Browse Source
This commit is contained in:
Franck Royer 2021-04-20 16:51:04 +10:00
parent 9095e3f145
commit afba3210e9
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
5 changed files with 924 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1175
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -54,14 +54,14 @@
"debug": "^4.3.1", "debug": "^4.3.1",
"it-concat": "^1.0.3", "it-concat": "^1.0.3",
"it-length-prefixed": "^3.1.0", "it-length-prefixed": "^3.1.0",
"libp2p": "^0.30.0", "libp2p": "^0.31.0-rc.3",
"libp2p-gossipsub": "^0.7.0", "libp2p-gossipsub": "^0.7.0",
"libp2p-mplex": "^0.10.2", "libp2p-mplex": "^0.10.2",
"libp2p-noise": "^2.0.5", "libp2p-noise": "^2.0.5",
"libp2p-secio": "^0.13.1", "libp2p-secio": "^0.13.1",
"libp2p-tcp": "^0.15.3", "libp2p-tcp": "^0.15.3",
"libp2p-websockets": "^0.15.5", "libp2p-websockets": "^0.15.5",
"multiaddr": "^8.1.2", "multiaddr": "^9.0.1",
"prompt-sync": "^4.2.0", "prompt-sync": "^4.2.0",
"ts-proto": "^1.79.3", "ts-proto": "^1.79.3",
"uuid": "^3.4.0", "uuid": "^3.4.0",

4
src/chat/index.ts
View File

@ -2,7 +2,7 @@ import readline from 'readline';
import util from 'util'; import util from 'util';
import TCP from 'libp2p-tcp'; import TCP from 'libp2p-tcp';
import Multiaddr from 'multiaddr'; import { multiaddr, Multiaddr } from 'multiaddr';
import Waku from '../lib/waku'; import Waku from '../lib/waku';
import { WakuMessage } from '../lib/waku_message'; import { WakuMessage } from '../lib/waku_message';
@ -109,7 +109,7 @@ function processArguments(): Options {
switch (arg) { switch (arg) {
case '--staticNode': case '--staticNode':
opts = Object.assign(opts, { opts = Object.assign(opts, {
staticNode: new Multiaddr(passedArgs.shift()), staticNode: multiaddr(passedArgs.shift()!),
}); });
break; break;
case '--listenAddr': case '--listenAddr':

2
src/lib/waku.ts
View File

@ -3,7 +3,7 @@ import Mplex from 'libp2p-mplex';
import { bytes } from 'libp2p-noise/dist/src/@types/basic'; import { bytes } from 'libp2p-noise/dist/src/@types/basic';
import { Noise } from 'libp2p-noise/dist/src/noise'; import { Noise } from 'libp2p-noise/dist/src/noise';
import Websockets from 'libp2p-websockets'; import Websockets from 'libp2p-websockets';
import Multiaddr from 'multiaddr'; import { Multiaddr } from 'multiaddr';
import PeerId from 'peer-id'; import PeerId from 'peer-id';
import { RelayCodec, WakuRelay } from './waku_relay'; import { RelayCodec, WakuRelay } from './waku_relay';

4
src/test_utils/nim_waku.ts
View File

@ -4,8 +4,7 @@ import { randomInt } from 'crypto';
import appRoot from 'app-root-path'; import appRoot from 'app-root-path';
import axios from 'axios'; import axios from 'axios';
import debug from 'debug'; import debug from 'debug';
import Multiaddr from 'multiaddr'; import { Multiaddr, multiaddr } from 'multiaddr';
import multiaddr from 'multiaddr';
import PeerId from 'peer-id'; import PeerId from 'peer-id';
import { WakuMessage } from '../lib/waku_message'; import { WakuMessage } from '../lib/waku_message';
@ -199,6 +198,7 @@ export class NimWaku {
const res = await this.info(); const res = await this.info();
this.multiaddrWithId = multiaddr(res.listenStr); this.multiaddrWithId = multiaddr(res.listenStr);
const peerIdStr = this.multiaddrWithId.getPeerId(); const peerIdStr = this.multiaddrWithId.getPeerId();
if (!peerIdStr) throw 'Nim-waku multiaddr does not contain peerId';
this.peerId = PeerId.createFromB58String(peerIdStr); this.peerId = PeerId.createFromB58String(peerIdStr);
return { peerId: this.peerId, multiaddrWithId: this.multiaddrWithId }; return { peerId: this.peerId, multiaddrWithId: this.multiaddrWithId };
} }