-
Notifications
You must be signed in to change notification settings - Fork 502
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
74 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3102,17 +3102,23 @@ | |
| "@walletconnect/types" "^1.8.0" | ||
| "@walletconnect/utils" "^1.8.0" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.2" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.2.tgz#a1bf6e3e87b33f9df795ce0970d8ddd400fdc8a3" | ||
| integrity sha512-JQz/xp3SLEpTeRQctdck2ugSBVEpMxoSE+lFi2voJkZop1hv6P+uqr6E4PzjFluAjeAnKlT1xvra0aFWjPWVcw== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.1.tgz#d1fb442bd77424666bacdb0f5a07f7708fb3d984" | ||
| integrity sha512-WAoXfmj+Zy5q48TnrKUjmHXJCBahzKwbul+noepRZf7JDtUAZ9IOWpUjg+UPRbfK5EiWZ0TF42S6SXidf7EHoQ== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@walletconnect/heartbeat" "1.2.1" | ||
| "@walletconnect/jsonrpc-provider" "1.0.13" | ||
|
|
@@ -3125,13 +3131,18 @@ | |
| "@walletconnect/relay-auth" "^1.0.4" | ||
| "@walletconnect/safe-json" "^1.0.2" | ||
| "@walletconnect/time" "^1.0.2" | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/types" "2.10.2" | ||
| "@walletconnect/utils" "2.10.2" | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> main | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> docs | ||
| events "^3.3.0" | ||
| lodash.isequal "4.5.0" | ||
| uint8arrays "^3.1.0" | ||
|
|
@@ -3213,33 +3224,45 @@ | |
| "@walletconnect/utils" "2.9.1" | ||
| events "^3.3.0" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/ethereum-provider@^2.10.2": | ||
| version "2.10.2" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.2.tgz#d5aca538fbcbbf7dd771bceb2430de30f06411de" | ||
| integrity sha512-QMYFZ6+rVq2CJLdIPdKK0j1Qm66UA27oQU5V2SrL8EVwl7wFfm0Bq7fnL+qAWeDpn612dNeNErpk/ROa1zWlWg== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/ethereum-provider@^2.10.1": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.1.tgz#4733a98f0b388cf5ae6c2b269f50da87da432ee5" | ||
| integrity sha512-Yhoz8EXkKzxOlBT6G+elphqCx/gkH6RxD9/ZAiy9lLc8Ng5p1gvKCVVP5zsGNE9FbkKmHd+J9JJRzn2Bw2yqtQ== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@walletconnect/jsonrpc-http-connection" "^1.0.7" | ||
| "@walletconnect/jsonrpc-provider" "^1.0.13" | ||
| "@walletconnect/jsonrpc-types" "^1.0.3" | ||
| "@walletconnect/jsonrpc-utils" "^1.0.8" | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/sign-client" "2.10.2" | ||
| "@walletconnect/types" "2.10.2" | ||
| "@walletconnect/universal-provider" "2.10.2" | ||
| "@walletconnect/utils" "2.10.2" | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/sign-client" "2.10.1" | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/universal-provider" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| events "^3.3.0" | ||
|
|
||
| "@walletconnect/events@^1.0.1": | ||
|
|
@@ -3485,6 +3508,7 @@ | |
| dependencies: | ||
| tslib "1.14.1" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.2" | ||
|
|
@@ -3493,25 +3517,35 @@ | |
| dependencies: | ||
| "@walletconnect/core" "2.10.2" | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.1.tgz#db60bc9400cd79f0cb2380067343512b21ee4749" | ||
| integrity sha512-iG3eJGi1yXeG3xGeVSSMf8wDFyx239B0prLQfy1uYDtYFb2ynnH/09oqAZyKn96W5nfQzUgM2Mz157PVdloH3Q== | ||
| dependencies: | ||
| "@walletconnect/core" "2.10.1" | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/events" "^1.0.1" | ||
| "@walletconnect/heartbeat" "1.2.1" | ||
| "@walletconnect/jsonrpc-utils" "1.0.8" | ||
| "@walletconnect/logger" "^2.0.1" | ||
| "@walletconnect/time" "^1.0.2" | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/types" "2.10.2" | ||
| "@walletconnect/utils" "2.10.2" | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> main | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> docs | ||
| events "^3.3.0" | ||
|
|
||
| "@walletconnect/[email protected]": | ||
|
|
@@ -3545,17 +3579,23 @@ | |
| dependencies: | ||
| tslib "1.14.1" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.2" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.2.tgz#68e433a29ec2cf42d79d8b50c77bd5c1d91db721" | ||
| integrity sha512-luNV+07Wdla4STi9AejseCQY31tzWKQ5a7C3zZZaRK/di+rFaAAb7YW04OP4klE7tw/mJRGPTlekZElmHxO8kQ== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.1.tgz#1355bce236f3eef575716ea3efe4beed98a873ef" | ||
| integrity sha512-7pccAhajQdiH2kYywjE1XI64IqRI+4ioyGy0wvz8d0UFQ/DSG3MLKR8jHf5aTOafQQ/HRLz6xvlzN4a7gIVkUQ== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@walletconnect/events" "^1.0.1" | ||
| "@walletconnect/heartbeat" "1.2.1" | ||
|
|
@@ -3593,23 +3633,30 @@ | |
| resolved "https://registry.npmjs.org/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195" | ||
| integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg== | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.2" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.2.tgz#85c8da39f65da8fe33f65f62689e703607b5ddc5" | ||
| integrity sha512-wFgI0LbQ3D56sgaUMsgOHCM5m8WLxiC71BGuCKQfApgsbNMVKugYVy2zWHyUyi8sqTQHI+uSaVpDev4UHq9LEw== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.1.tgz#c4a77bd2eed1a335edae5b2b298636092fff63ef" | ||
| integrity sha512-81QxTH/X4dRoYCz0U9iOrBYOcj7N897ONcB57wsGhEkV7Rc9htmWJq2CzeOuxvVZ+pNZkE+/aw9LrhizO1Ltxg== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@walletconnect/jsonrpc-http-connection" "^1.0.7" | ||
| "@walletconnect/jsonrpc-provider" "1.0.13" | ||
| "@walletconnect/jsonrpc-types" "^1.0.2" | ||
| "@walletconnect/jsonrpc-utils" "^1.0.7" | ||
| "@walletconnect/logger" "^2.0.1" | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/sign-client" "2.10.2" | ||
| "@walletconnect/types" "2.10.2" | ||
|
|
@@ -3619,6 +3666,11 @@ | |
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> main | ||
| ======= | ||
| "@walletconnect/sign-client" "2.10.1" | ||
| "@walletconnect/types" "2.10.1" | ||
| "@walletconnect/utils" "2.10.1" | ||
| >>>>>>> docs | ||
| events "^3.3.0" | ||
|
|
||
| "@walletconnect/[email protected]": | ||
|
|
@@ -3636,17 +3688,23 @@ | |
| "@walletconnect/utils" "2.9.1" | ||
| events "^3.3.0" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.2" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.2.tgz#1f2c6a2f1bb95bcc4517b1e94aa7164c9286eb46" | ||
| integrity sha512-syxXRpc2yhSknMu3IfiBGobxOY7fLfLTJuw+ppKaeO6WUdZpIit3wfuGOcc0Ms3ZPFCrGfyGOoZsCvgdXtptRg== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@walletconnect/[email protected]": | ||
| version "2.10.1" | ||
| resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.1.tgz#65b37c9800eb0e80a08385b6987471fb46e1e22e" | ||
| integrity sha512-DM0dKgm9O58l7VqJEyV2OVv16XRePhDAReI23let6WdW1dSpw/Y/A89Lp99ZJOjLm2FxyblMRF3YRaZtHwBffw== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@stablelib/chacha20poly1305" "1.0.1" | ||
| "@stablelib/hkdf" "1.0.1" | ||
|
|
@@ -3656,11 +3714,15 @@ | |
| "@walletconnect/relay-api" "^1.0.9" | ||
| "@walletconnect/safe-json" "^1.0.2" | ||
| "@walletconnect/time" "^1.0.2" | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@walletconnect/types" "2.10.2" | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| >>>>>>> main | ||
| ======= | ||
| "@walletconnect/types" "2.10.1" | ||
| >>>>>>> docs | ||
| "@walletconnect/window-getters" "^1.0.1" | ||
| "@walletconnect/window-metadata" "^1.0.1" | ||
| detect-browser "5.3.0" | ||
|
|
@@ -3979,17 +4041,23 @@ | |
| tallyho-detect-provider "^1.0.0" | ||
| tallyho-onboarding "^1.0.2" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@web3-onboard/torus@^2.2.6": | ||
| version "2.2.6" | ||
| resolved "https://registry.yarnpkg.com/@web3-onboard/torus/-/torus-2.2.6.tgz#408307cc43d13ccaaa789c2f8f0b6d32bbad71ab" | ||
| integrity sha512-UJNZAhFn6C8YJqpB9huHKWUOMKTf2pWBO02Oxr/OIbClB/ljeVo2Bq2ml9vcONFLbAKO00KjfRmXmbuZetWSaA== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@web3-onboard/torus@^2.2.6-alpha.1": | ||
| version "2.2.6-alpha.1" | ||
| resolved "https://registry.yarnpkg.com/@web3-onboard/torus/-/torus-2.2.6-alpha.1.tgz#e243d7c8e606ebe0c7f51db8b6f7d6e4ed06b6e9" | ||
| integrity sha512-tg8N0zG3+L35pC5j+lI/3BeyfgPygQj7+Q0fmkbQ+YSojoVI0MKx8Oinn1cs8WzAlZZPU8RXfDYsjrazFscWAA== | ||
| <<<<<<< HEAD | ||
| >>>>>>> main | ||
| ======= | ||
| >>>>>>> docs | ||
| dependencies: | ||
| "@toruslabs/torus-embed" "2.2.9" | ||
| "@web3-onboard/common" "^2.3.3" | ||
|
|
@@ -4052,6 +4120,7 @@ | |
| "@venly/web3-provider" "^3.1.1" | ||
| "@web3-onboard/common" "^2.3.1" | ||
|
|
||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| "@web3-onboard/walletconnect@^2.5.0-alpha.1": | ||
| version "2.5.0-alpha.1" | ||
|
|
@@ -4061,6 +4130,8 @@ | |
| "@walletconnect/ethereum-provider" "^2.10.2" | ||
| "@walletconnect/modal" "2.6.2" | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| "@web3-onboard/walletconnect@^2.4.7": | ||
| version "2.4.7" | ||
| resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.4.7.tgz#e7b0c6494b5414fbf6450689941a01cb1eb7898c" | ||
|
|
@@ -9345,11 +9416,14 @@ [email protected]: | |
| long "^5.0.0" | ||
|
|
||
| protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3: | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| version "6.11.4" | ||
| resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" | ||
| integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw== | ||
| ======= | ||
| ======= | ||
| >>>>>>> docs | ||
| version "6.11.3" | ||
| resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" | ||
| integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== | ||
|
|
||