From efea48ded7d902c268b98a3204af0e831ff4f7d2 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Thu, 17 Dec 2020 13:25:52 +0200 Subject: [PATCH] Up rendezvous, fix web3Options --- .../concordia-app/src/options/web3Options.js | 2 +- packages/concordia-rendezvous/package.json | 4 +- yarn.lock | 37 ++++++++++++++++--- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/packages/concordia-app/src/options/web3Options.js b/packages/concordia-app/src/options/web3Options.js index 36fac71..0190d32 100644 --- a/packages/concordia-app/src/options/web3Options.js +++ b/packages/concordia-app/src/options/web3Options.js @@ -17,7 +17,7 @@ const web3WebsocketOptions = { }; const web3 = (WEB3_HOST !== undefined && WEB3_PORT !== undefined) - ? `ws://${WEB3_HOST}:${WEB3_PORT}` + ? new Web3.providers.WebsocketProvider(`ws://${WEB3_HOST}:${WEB3_PORT}`) : new Web3(Web3.givenProvider || new Web3.providers.WebsocketProvider( `ws://${WEB3_HOST_DEFAULT}:${WEB3_PORT_DEFAULT}`, web3WebsocketOptions, )); diff --git a/packages/concordia-rendezvous/package.json b/packages/concordia-rendezvous/package.json index bb7e7dc..33c3363 100644 --- a/packages/concordia-rendezvous/package.json +++ b/packages/concordia-rendezvous/package.json @@ -7,7 +7,7 @@ "rendezvous": "star-signal --port=9090 --host=127.0.0.1", "start": "star-signal --port=9090 --host=127.0.0.1" }, - "devDependencies": { - "libp2p-webrtc-star": "~0.20.1" + "dependencies": { + "libp2p-webrtc-star": "~0.20.5" } } diff --git a/yarn.lock b/yarn.lock index 92bb359..ad94257 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1537,10 +1537,10 @@ redux-saga "~1.1.3" web3 "~1.3.0" -"@ezerous/eth-identity-provider@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.1.tgz#cc29d4554a177b98ed724cfd861ea86c8a87fc38" - integrity sha512-GeownhQwxFyKNFteCjSi+6HkmzvakTdRRHqD6kIoLwkAamhJ88mSOxFt2N4PMEmJySxdb6PZHPdovda5xENs8w== +"@ezerous/eth-identity-provider@~0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.2.tgz#c1489a8d3ef5aec93ee53e7d96363a67409b3ada" + integrity sha512-VfKzG0Hxv7IBZ06tIidtPRp/B4u+33Ug8dthXwYh0gGNuMIfXY9K0dR2gOZKYc6saS+pzTIEp/tjf5pb9V737Q== dependencies: level "~6.0.1" orbit-db-identity-provider "~0.3.1" @@ -10755,7 +10755,7 @@ libp2p-webrtc-peer@^10.0.1: randombytes "^2.0.3" readable-stream "^3.4.0" -libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: +libp2p-webrtc-star@^0.20.1: version "0.20.2" resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.2.tgz#9979e42d02c5f42fc78785b3c325b7f0fad50a35" integrity sha512-P4oZ/v/bhhR0U/dpq8QfzRyKE2l5L4KFM6yrc3j1bj+gbQLBMH2P76/N3jlHqTVBdYavOwdCEifXwfG/qGp+3Q== @@ -10782,6 +10782,33 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1: stream-to-it "^0.2.2" streaming-iterables "^5.0.3" +libp2p-webrtc-star@~0.20.5: + version "0.20.5" + resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a" + integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q== + dependencies: + "@hapi/hapi" "^20.0.0" + "@hapi/inert" "^6.0.3" + abortable-iterator "^3.0.0" + class-is "^1.1.0" + debug "^4.2.0" + err-code "^2.0.3" + ipfs-utils "^5.0.0" + it-pipe "^1.1.0" + libp2p-utils "^0.2.1" + libp2p-webrtc-peer "^10.0.1" + mafmt "^8.0.0" + menoetius "0.0.2" + minimist "^1.2.5" + multiaddr "^8.0.0" + p-defer "^3.0.0" + peer-id "^0.14.2" + prom-client "^12.0.0" + socket.io "^2.3.0" + socket.io-client "^2.3.0" + stream-to-it "^0.2.2" + streaming-iterables "^5.0.3" + libp2p-websockets@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/libp2p-websockets/-/libp2p-websockets-0.14.0.tgz#e1c48d1787e88dee85db740598b9a6a687fe225c"