Merge origin/develop into upgrade-lumos

nervosnetwork · Jun 21, 2023 · 3d7a766 · 3d7a766
1 parent 3b9a06e
commit 3d7a766
Showing 1 changed file with 63 additions and 74 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -1342,70 +1342,61 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@ckb-lumos/base@0.18.0", "@ckb-lumos/base@^0.18.0-rc2":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.18.0.tgz#225ad3e95fcb8b1d7e79f3784a86261c6f60d516"
-  integrity sha512-+CW+e7iQcAqSFDzU2UDaPoEpncuQfFx4PnzTsmC6Nr70IAi4BdwZVl+8H5usYHhSZMzkCMXJ4aK2nLquEPmcdA==
-  dependencies:
-    "@ckb-lumos/bi" "0.18.0"
-    "@ckb-lumos/toolkit" "0.18.0"
+"@ckb-lumos/base@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.20.0-alpha.3.tgz#5cc257b708e4fc894f11028ec46616fb4750fc49"
+  integrity sha512-O0fycJlBPZQdCAma2KrQdBAP2O0UxaTwczwPgw2lPRqSlE5wdXigJYcN8mdsnWd8YycaKr1FUb2j0hPpVwflog==
+  dependencies:
+    "@ckb-lumos/bi" "0.20.0-alpha.3"
+    "@ckb-lumos/codec" "0.20.0-alpha.3"
+    "@ckb-lumos/toolkit" "0.20.0-alpha.3"
+    "@types/blake2b" "^2.1.0"
     "@types/lodash.isequal" "^4.5.5"
     blake2b "^2.1.3"
     js-xxhash "^1.0.4"
     lodash.isequal "^4.5.0"
 
-"@ckb-lumos/base@0.18.0-rc2":
-  version "0.18.0-rc2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.18.0-rc2.tgz#810a6bc84ce8699aeefb39e4c9e89db44df2de0b"
-  integrity sha512-bX7X03zZR7ge3y+KMY84OCqHhwMDwEfpTj0fL1yOlhhHx7jQmQ8eMQqzMpOgxzfEo0MXddfBGxU0/ThoxS3ZRA==
-  dependencies:
-    blake2b "^2.1.3"
-    ckb-js-toolkit "^0.100.0-rc1"
-    immutable "^4.0.0-rc.12"
-    js-xxhash "^1.0.4"
-
-"@ckb-lumos/bi@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.18.0.tgz#9d0186788574b31845de4ec65e746ea61b4b9002"
-  integrity sha512-0gvj75dDM9i6BFbE40ja9Z9vqrnW9FiyVPxvSSa1lTdOoCenPusJXdZUwBBLnfq4kRVsPC5pWcohTDhieyCbuA==
-  dependencies:
-    jsbi "^4.1.0"
-
-"@ckb-lumos/bi@^0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.19.0.tgz#ccd7e9e32e58eec7effc78cd171eb79f0f858d4a"
-  integrity sha512-+EFkUOqCtIwilAfrd680wEeMTXME9Wjjyl436+0x32jlbfo4sa+iNqwPaTjUQ2/SDwsuqK3eB+DntYxxFxoEtw==
+"@ckb-lumos/bi@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.20.0-alpha.3.tgz#7c20776558d33b838e54550be22ff8eed909a3e4"
+  integrity sha512-/sGxpnkESboLQyT17UEni4Qw5DnpXw8hjuckAfiG8Hopv2fIaDdrDup613AGzmAkaWMr2Z4DK6tP6x0qR7feSw==
   dependencies:
     jsbi "^4.1.0"
 
-"@ckb-lumos/codec@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.19.0.tgz#c9cda5e37fd5591abeaac9d5ed9577cfad206c09"
-  integrity sha512-MAts5rm5xLcvPslW6HwU/TlRoJ3jTtgsdtyakIa7qQo+0DlHdV6BOxTNDPtP3yqp8p5YFef7uCi/rcpi/KOGwA==
+"@ckb-lumos/ckb-indexer@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.20.0-alpha.3.tgz#6d20f59b197d90ff83f8c73508416019a49a4865"
+  integrity sha512-kjcpEEq3cWytEcTg52/8WFn5LnXu41IL0ZevTdTk2Nl8ul3VPbuyJa1dwmJZb0uahye3kNb/dtqmE7xOKXbYuA==
   dependencies:
-    "@ckb-lumos/bi" "^0.19.0"
+    "@ckb-lumos/base" "0.20.0-alpha.3"
+    "@ckb-lumos/bi" "0.20.0-alpha.3"
+    "@ckb-lumos/rpc" "0.20.0-alpha.3"
+    "@ckb-lumos/toolkit" "0.20.0-alpha.3"
+    cross-fetch "^3.1.5"
+    events "^3.3.0"
 
-"@ckb-lumos/rpc@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.18.0.tgz#3858b5eaa4b06a90d4a0931cc3168fab835f4a0c"
-  integrity sha512-HwmLGT6ZUQ9LEorbMTLL6y9pz30Ti2yxHKlvT0w8kN7qlEDc4bzGN3UYtbeMoGR6VLPklJ/2/d/OnajAiLSrKw==
+"@ckb-lumos/codec@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.20.0-alpha.3.tgz#e177efc177cc9200c793b52281ab5bdf350b40ef"
+  integrity sha512-d+Au9tPjV3SKHIVJ/YG0ScpMPLrt1fCUwm16QTm0qcZuBljLdsSow8PyxmLWhHEatiQV13TuR9ZcOHxdufX7+A==
   dependencies:
-    "@ckb-lumos/base" "0.18.0"
-    "@ckb-lumos/bi" "0.18.0"
-    "@ckb-lumos/toolkit" "0.18.0"
+    "@ckb-lumos/bi" "0.20.0-alpha.3"
 
-"@ckb-lumos/rpc@0.18.0-rc2":
-  version "0.18.0-rc2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.18.0-rc2.tgz#f7360d7e89d76c97188711eba5faedc4e23b2d40"
-  integrity sha512-ZuJW5NA4GOO6repwZGD8OqTT6sRmKvLPrut0s2xK7uIiGh5bdL9NThk7Nlnbyvtp8LVxIe4LHFgxFzWbZ+NXMA==
+"@ckb-lumos/rpc@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.20.0-alpha.3.tgz#e1c7d1aaaaedfca1d7da75aac699ffd2fa060cc5"
+  integrity sha512-Y2tEFhPNNiPeYOknm4ymsoyz9vbXUxMeGnszIOzCckvMQ2/go/0qJCYqOLhUho+ETPC3DGqlurRRc6Y4NMk6zQ==
   dependencies:
-    "@ckb-lumos/base" "^0.18.0-rc2"
-    ckb-js-toolkit "^0.100.0-rc1"
+    "@ckb-lumos/base" "0.20.0-alpha.3"
+    "@ckb-lumos/bi" "0.20.0-alpha.3"
+    "@vespaiach/axios-fetch-adapter" "^0.3.1"
+    axios "0.27.2"
+    tslib "2.3.1"
 
-"@ckb-lumos/toolkit@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.18.0.tgz#8f9dbc469f081eeee2c6200ce0c0435211775e52"
-  integrity sha512-1m4H52bX2E08VlV9P8eAHOGr4Lbc/Soya53+iwJbsQSH3gXUyWcxDKz5T4iIPMqfYuOztRF01wFdGPD0WPyEJQ==
+"@ckb-lumos/toolkit@0.20.0-alpha.3":
+  version "0.20.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0-alpha.3.tgz#17ccd898abf00a601a58d4776031bc8de0df7a8e"
+  integrity sha512-mDwrYcu34o1rRd1YhWKW7ye0SK+9cQRyB/LnxXE7L/8iNIl9JgaIUGRjIoQr2+OPxzUxorvCEwgh1WzywNrZmQ==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -4126,6 +4117,11 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@types/blake2b@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/blake2b/-/blake2b-2.1.0.tgz#d906320255d84f9c05fc6f3a28db81c952ee989b"
+  integrity sha512-Mv8N0qtdb72iW1XJR/4Yp01frtibnv8BpFUZDROnzd7hVEX4cEN/xHgU2ZfsnOnTDt+fHJVc0uRIWcNz6uIB2A==
+
 "@types/bn.js@*":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682"
@@ -5076,6 +5072,11 @@
     prop-types "^15.7.2"
     tslib "^1.10.0"
 
+"@vespaiach/axios-fetch-adapter@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz#b0c08167bec9cc558f578a1b9ccff52ead1cf1cb"
+  integrity sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -6263,6 +6264,14 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+  dependencies:
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
+
 axios@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
@@ -7432,14 +7441,6 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
-ckb-js-toolkit@0.100.0-rc1, ckb-js-toolkit@^0.100.0-rc1:
-  version "0.100.0-rc1"
-  resolved "https://registry.yarnpkg.com/ckb-js-toolkit/-/ckb-js-toolkit-0.100.0-rc1.tgz#4c2b71db5092b69ae44ad52880c00b4c0e6cc494"
-  integrity sha512-8TnOS8qGskcmINfeSN+DEdPmGouTe1XRBYtT3uxYq0e+R3yeUS/46uZmhG3LL5IpudZpYwopaAY+/UYV5q0iig==
-  dependencies:
-    cross-fetch "^3.0.6"
-    jsbi "^3.1.2"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -8122,14 +8123,7 @@ cross-env@7.0.3:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-fetch@3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
-cross-fetch@^3.0.6:
+cross-fetch@^3.1.5:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c"
   integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==
@@ -9818,7 +9812,7 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@3.3.0, events@^3.0.0, events@^3.2.0, events@^3.3.0:
+events@^3.0.0, events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -10297,7 +10291,7 @@ focus-lock@^0.8.0:
   dependencies:
     tslib "^1.9.3"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -11552,7 +11546,7 @@ immer@9.0.21, immer@^9.0.7:
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
   integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
-immutable@^4.0.0, immutable@^4.0.0-rc.12:
+immutable@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
   integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
@@ -12997,11 +12991,6 @@ jsbi@3.1.3:
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.3.tgz#f024b340032f7c7caaa6ca4b32b55e8d33f6e897"
   integrity sha512-nBJqA0C6Qns+ZxurbEoIR56wyjiUszpNy70FHvxO5ervMoCbZVE3z3kxr5nKGhlxr/9MhKTSUBs7cAwwuf3g9w==
 
-jsbi@^3.1.2:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.2.5.tgz#b37bb90e0e5c2814c1c2a1bcd8c729888a2e37d6"
-  integrity sha512-aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ==
-
 jsbi@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"