From 691f82c6ac86f2d0633fa2aec4bd2cb2781f4fb4 Mon Sep 17 00:00:00 2001
From: Nikos Kontakis <wirednkod@gmail.com>
Date: Mon, 4 Oct 2021 17:23:52 +0300
Subject: [PATCH] Upgrade substrate connect to 0.4.0 (#6236)

* Update substrate-connect to 0.3.19

* upgrade to version 0.4.0 (changed API)

* minor fix on substrate connect provider's API
---
 packages/react-api/package.json |   2 +-
 packages/react-api/src/Api.tsx  |   2 +-
 yarn.lock                       | 107 +++++++++++---------------------
 3 files changed, 39 insertions(+), 72 deletions(-)

diff --git a/packages/react-api/package.json b/packages/react-api/package.json
index 7be18429d0..2836b066ff 100644
--- a/packages/react-api/package.json
+++ b/packages/react-api/package.json
@@ -9,7 +9,7 @@
     "@polkadot/api": "^6.1.3-3",
     "@polkadot/extension-compat-metamask": "^0.40.4-0",
     "@polkadot/extension-dapp": "^0.40.4-0",
-    "@substrate/connect": "^0.3.18",
+    "@substrate/connect": "^0.4.0",
     "fflate": "^0.7.1",
     "rxjs": "^7.3.0"
   }
diff --git a/packages/react-api/src/Api.tsx b/packages/react-api/src/Api.tsx
index 19111a3a28..867b2b6265 100644
--- a/packages/react-api/src/Api.tsx
+++ b/packages/react-api/src/Api.tsx
@@ -198,7 +198,7 @@ function Api ({ apiUrl, children, store }: Props): React.ReactElement<Props> | n
     if (apiUrl.startsWith('light://')) {
       const detect = new Detector('polkadot-js/apps');
 
-      provider = detect.provider(apiUrl.replace('light://substrate-connect/', ''));
+      provider = detect.provider({ name: apiUrl.replace('light://substrate-connect/', ''), spec: '' });
       provider.connect().catch(console.error);
     } else {
       provider = new WsProvider(apiUrl);
diff --git a/yarn.lock b/yarn.lock
index 05f4b0628c..ad3dc673a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3113,7 +3113,7 @@ __metadata:
     "@polkadot/api": ^6.1.3-3
     "@polkadot/extension-compat-metamask": ^0.40.4-0
     "@polkadot/extension-dapp": ^0.40.4-0
-    "@substrate/connect": ^0.3.18
+    "@substrate/connect": ^0.4.0
     fflate: ^0.7.1
     rxjs: ^7.3.0
   languageName: unknown
@@ -3272,19 +3272,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-provider@npm:^4.10.1":
-  version: 4.16.2
-  resolution: "@polkadot/rpc-provider@npm:4.16.2"
+"@polkadot/rpc-provider@npm:^5.8.3":
+  version: 5.9.1
+  resolution: "@polkadot/rpc-provider@npm:5.9.1"
   dependencies:
-    "@babel/runtime": ^7.14.6
-    "@polkadot/types": 4.16.2
-    "@polkadot/util": ^6.10.1
-    "@polkadot/util-crypto": ^6.10.1
-    "@polkadot/x-fetch": ^6.10.1
-    "@polkadot/x-global": ^6.10.1
-    "@polkadot/x-ws": ^6.10.1
+    "@babel/runtime": ^7.15.4
+    "@polkadot/types": 5.9.1
+    "@polkadot/util": ^7.3.1
+    "@polkadot/util-crypto": ^7.3.1
+    "@polkadot/x-fetch": ^7.3.1
+    "@polkadot/x-global": ^7.3.1
+    "@polkadot/x-ws": ^7.3.1
     eventemitter3: ^4.0.7
-  checksum: 957e7c9336fa870a16883d704e779d5920a647746748b1a4c837cfd2201a568951917ce4dcd9eb25c6a46ef563b04d26b87128cdcf1d70a1203ee3ca63514a46
+  checksum: 873fdd410720c8fdbe9d23135717f2dd711f68808cfde17fb20a9544054017d0b245b8cf4ee5c5fb62835869810dc6cf57288cc3b5c6d6d22d9806d08718748c
   languageName: node
   linkType: hard
 
@@ -3483,19 +3483,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-fetch@npm:^6.10.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-fetch@npm:6.11.1"
-  dependencies:
-    "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
-    "@types/node-fetch": ^2.5.10
-    node-fetch: ^2.6.1
-  checksum: 06d96c8a3ece6b11651948f644823de28aed0eea416466fc00b9dfa60b89a39476b679784c4b64c7ca541a95cb6552030f66974df58269eda0024721850ff1be
-  languageName: node
-  linkType: hard
-
-"@polkadot/x-fetch@npm:^7.4.1":
+"@polkadot/x-fetch@npm:^7.3.1, @polkadot/x-fetch@npm:^7.4.1":
   version: 7.4.1
   resolution: "@polkadot/x-fetch@npm:7.4.1"
   dependencies:
@@ -3507,16 +3495,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-global@npm:6.11.1, @polkadot/x-global@npm:^6.10.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-global@npm:6.11.1"
-  dependencies:
-    "@babel/runtime": ^7.14.6
-  checksum: c0114b2fe8a0f4b238f39b4040a5c917e968bf912b2186bb0860597ead9921c2200dbb91b4462d6476be1243297d1b34479fdd79e934927d4d076005f36c26c9
-  languageName: node
-  linkType: hard
-
-"@polkadot/x-global@npm:7.4.1, @polkadot/x-global@npm:^7.4.1":
+"@polkadot/x-global@npm:7.4.1, @polkadot/x-global@npm:^7.3.1, @polkadot/x-global@npm:^7.4.1":
   version: 7.4.1
   resolution: "@polkadot/x-global@npm:7.4.1"
   dependencies:
@@ -3555,19 +3534,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-ws@npm:^6.10.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-ws@npm:6.11.1"
-  dependencies:
-    "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
-    "@types/websocket": ^1.0.3
-    websocket: ^1.0.34
-  checksum: 056b7e03d7bc643ab2d4d3beba7fa97e3dcab8c9cb152677610214ecc34f0c02c2ae7e40d33903c8aeafa0f9c20e106d94785849ca1b9c890e031b1ecd98a9b8
-  languageName: node
-  linkType: hard
-
-"@polkadot/x-ws@npm:^7.4.1":
+"@polkadot/x-ws@npm:^7.3.1, @polkadot/x-ws@npm:^7.4.1":
   version: 7.4.1
   resolution: "@polkadot/x-ws@npm:7.4.1"
   dependencies:
@@ -3850,21 +3817,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@substrate/connect@npm:^0.3.18":
-  version: 0.3.18
-  resolution: "@substrate/connect@npm:0.3.18"
+"@substrate/connect@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@substrate/connect@npm:0.4.0"
   dependencies:
-    "@polkadot/api": ^4.15.1
-    "@polkadot/rpc-provider": ^4.10.1
+    "@polkadot/api": ^5.8.3
+    "@polkadot/rpc-provider": ^5.8.3
     "@substrate/connect-extension-protocol": ^0.3.0
+    "@substrate/smoldot-light": ^0.4.11
     browserify-fs: ^1.0.0
     eventemitter3: ^4.0.7
     file-entry-cache: ^6.0.1
     mkdirp: ^1.0.4
-    smoldot: ^0.3.4
   peerDependencies:
-    "@polkadot/wasm-crypto": ^3.2.2
-  checksum: e992ce4f77e14b49157f872c752c7ff14e4f68625ab65bafbea95315d92d08e343b83e26759daebd5f3b7ea2911c148ca89c7035d7464eb1b03adbe0c22fa053
+    "@polkadot/wasm-crypto": ^4.1.2
+  checksum: b719be20034033441d4ab7a03c93d07f22bd5171df7616112f2ca79cee7b4ef5401575b013c346fb3d61e033ac4a043e10f3863c62817e4d2a6402c53e2211f2
+  languageName: node
+  linkType: hard
+
+"@substrate/smoldot-light@npm:^0.4.11":
+  version: 0.4.11
+  resolution: "@substrate/smoldot-light@npm:0.4.11"
+  dependencies:
+    buffer: ^6.0.1
+    performance-now: ^2.1.0
+    randombytes: ^2.1.0
+    websocket: ^1.0.32
+  checksum: 53b0b5d2a1afb18f3cea32fd5f1b662e415f0fc1952bfcdfc350a8aef65998f96fd98806c842e0054f22f788e68bace68e51e5513f0b80aedf7e1c0703ff12a4
   languageName: node
   linkType: hard
 
@@ -4310,7 +4289,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.5.10, @types/node-fetch@npm:^2.5.12":
+"@types/node-fetch@npm:^2.5.12":
   version: 2.5.12
   resolution: "@types/node-fetch@npm:2.5.12"
   dependencies:
@@ -4659,7 +4638,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/websocket@npm:^1.0.3, @types/websocket@npm:^1.0.4":
+"@types/websocket@npm:^1.0.4":
   version: 1.0.4
   resolution: "@types/websocket@npm:1.0.4"
   dependencies:
@@ -18255,18 +18234,6 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"smoldot@npm:^0.3.4":
-  version: 0.3.6
-  resolution: "smoldot@npm:0.3.6"
-  dependencies:
-    buffer: ^6.0.1
-    performance-now: ^2.1.0
-    randombytes: ^2.1.0
-    websocket: ^1.0.32
-  checksum: ef5d622892c1c087a95a72c73f1c6ad1662d32a703e22efe0567fb032822383ce450483b1cf76eff62b043803b50dd368fcbe35f73a3a3ab1b8e7b92ba04b992
-  languageName: node
-  linkType: hard
-
 "sockjs@npm:^0.3.21":
   version: 0.3.21
   resolution: "sockjs@npm:0.3.21"