From 56b76d38a53333c2894ff786e1f5f9b8ad29abb9 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Tue, 19 Sep 2023 16:49:10 +0800 Subject: [PATCH 01/13] chore: bump package versions --- packages/mask/package.json | 14 +++++++------- packages/plugin-infra/package.json | 10 +++++----- packages/plugins/Approval/package.json | 2 +- packages/plugins/ArtBlocks/package.json | 4 ++-- packages/plugins/Avatar/package.json | 2 +- packages/plugins/Claim/package.json | 4 ++-- packages/plugins/Collectible/package.json | 2 +- packages/plugins/Debugger/package.json | 6 +++--- packages/plugins/EVM/package.json | 12 ++++++------ packages/plugins/Flow/package.json | 2 +- packages/plugins/Gitcoin/package.json | 4 ++-- packages/plugins/Handle/package.json | 2 +- packages/plugins/MaskBox/package.json | 6 +++--- packages/plugins/RSS3/package.json | 4 ++-- packages/plugins/RedPacket/package.json | 6 +++--- packages/plugins/Savings/package.json | 6 +++--- packages/plugins/Tips/package.json | 2 +- packages/plugins/Trader/package.json | 4 ++-- packages/plugins/Web3Profile/package.json | 2 +- packages/shared-base/package.json | 4 ++-- packages/shared/package.json | 6 +++--- packages/types/package.json | 2 +- packages/web3-contracts/package.json | 6 +++--- packages/web3-hooks/base/package.json | 4 ++-- packages/web3-hooks/evm/package.json | 8 ++++---- packages/web3-providers/package.json | 14 +++++++------- packages/web3-shared/base/package.json | 4 ++-- packages/web3-shared/evm/package.json | 16 ++++++++-------- packages/web3-shared/flow/package.json | 2 +- packages/web3-shared/solana/package.json | 2 +- 30 files changed, 81 insertions(+), 81 deletions(-) diff --git a/packages/mask/package.json b/packages/mask/package.json index 3cd9691f37b3..a4b421890972 100644 --- a/packages/mask/package.json +++ b/packages/mask/package.json @@ -114,7 +114,7 @@ "anchorme": "^2.1.2", "assert": "^2.0.0", "async-call-rpc": "^6.3.1", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "bip39": "^3.1.0", "buffer": "^6.0.3", "clipboard-polyfill": "^3.0.3", @@ -162,12 +162,12 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-core-helpers": "1.8.0", - "web3-eth-abi": "1.8.0", - "web3-eth-contract": "1.8.0", - "web3-utils": "1.8.0", + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-core-helpers": "1.10.2", + "web3-eth-abi": "1.10.2", + "web3-eth-contract": "1.10.2", + "web3-utils": "1.10.2", "webextension-polyfill": "^0.10.0", "zod": "^3.22.2" }, diff --git a/packages/plugin-infra/package.json b/packages/plugin-infra/package.json index 43d4eba29975..9496842ffb64 100644 --- a/packages/plugin-infra/package.json +++ b/packages/plugin-infra/package.json @@ -77,7 +77,7 @@ "@types/ethereum-blockies": "^0.1.0", "@types/use-subscription": "^1.0.0", "async-call-rpc": "^6.3.1", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "ethereum-blockies": "^0.1.1", "lru-cache": "^10.0.0", "react-use": "^17.4.0", @@ -85,10 +85,10 @@ "urlcat": "^3.1.0", "use-subscription": "^1.8.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-core-helpers": "1.8.0", - "web3-utils": "1.8.0", + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-core-helpers": "1.10.2", + "web3-utils": "1.10.2", "webextension-polyfill": "^0.10.0" } } diff --git a/packages/plugins/Approval/package.json b/packages/plugins/Approval/package.json index 211c6f4da46d..8fd2c3c4fcb9 100644 --- a/packages/plugins/Approval/package.json +++ b/packages/plugins/Approval/package.json @@ -27,7 +27,7 @@ "@masknet/web3-telemetry": "workspace:^", "react-use": "^17.4.0", "urlcat": "^3.1.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "unstated-next": "^1.1.0" } } diff --git a/packages/plugins/ArtBlocks/package.json b/packages/plugins/ArtBlocks/package.json index 148a904d86c1..e30d75c3d67a 100644 --- a/packages/plugins/ArtBlocks/package.json +++ b/packages/plugins/ArtBlocks/package.json @@ -26,10 +26,10 @@ "@masknet/web3-providers": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-shared-evm": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "react-use": "^17.4.0", "ts-results-es": "^4.0.0", "urlcat": "^3.1.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Avatar/package.json b/packages/plugins/Avatar/package.json index 131bb73277fb..4c1944185373 100644 --- a/packages/plugins/Avatar/package.json +++ b/packages/plugins/Avatar/package.json @@ -28,7 +28,7 @@ "@types/react-avatar-editor": "^13.0.0", "@types/use-subscription": "^1.0.0", "@types/uuid": "^9.0.3", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "lru-cache": "^10.0.0", "react-avatar-editor": "^13.0.0", "react-router-dom": "^6.14.2", diff --git a/packages/plugins/Claim/package.json b/packages/plugins/Claim/package.json index 7e32ceb7b738..701ac3c57c1f 100644 --- a/packages/plugins/Claim/package.json +++ b/packages/plugins/Claim/package.json @@ -25,8 +25,8 @@ "@masknet/web3-contracts": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-providers": "workspace:^", - "web3-utils": "1.8.0", - "bignumber.js": "9.1.1", + "web3-utils": "1.10.2", + "bignumber.js": "9.1.2", "urlcat": "^3.1.0", "date-fns": "^2.30.0", "@ethersproject/abi": "^5.4.0", diff --git a/packages/plugins/Collectible/package.json b/packages/plugins/Collectible/package.json index d875dc004a26..1ac9009d68a2 100644 --- a/packages/plugins/Collectible/package.json +++ b/packages/plugins/Collectible/package.json @@ -28,7 +28,7 @@ "@masknet/web3-shared-flow": "workspace:^", "@masknet/web3-shared-solana": "workspace:^", "@masknet/web3-telemetry": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "immer": "^10.0.2", "react-use": "^17.4.0", diff --git a/packages/plugins/Debugger/package.json b/packages/plugins/Debugger/package.json index 9e5fa23e81cc..e47587c7b14c 100644 --- a/packages/plugins/Debugger/package.json +++ b/packages/plugins/Debugger/package.json @@ -29,11 +29,11 @@ "@masknet/web3-shared-evm": "workspace:^", "@masknet/web3-shared-flow": "workspace:^", "@masknet/web3-shared-solana": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "react-use": "^17.4.0", "urlcat": "^3.1.0", - "web3-core-helpers": "1.8.0", - "web3-utils": "1.8.0" + "web3-core-helpers": "1.10.2", + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/EVM/package.json b/packages/plugins/EVM/package.json index 81841e5e1612..139a4d3bf95d 100644 --- a/packages/plugins/EVM/package.json +++ b/packages/plugins/EVM/package.json @@ -31,16 +31,16 @@ "@masknet/web3-shared-flow": "workspace:^", "@metamask/eth-sig-util": "^4.0.0", "@servie/events": "^3.0.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "fortmatic": "^2.2.1", "react-use": "^17.4.0", "urlcat": "^3.1.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-core-helpers": "1.8.0", - "web3-eth-abi": "1.8.0", - "web3-utils": "1.8.0" + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-core-helpers": "1.10.2", + "web3-eth-abi": "1.10.2", + "web3-utils": "1.10.2" }, "devDependencies": { "@types/use-subscription": "^1.0.0" diff --git a/packages/plugins/Flow/package.json b/packages/plugins/Flow/package.json index ae4be0be1caa..984b9c634fdc 100644 --- a/packages/plugins/Flow/package.json +++ b/packages/plugins/Flow/package.json @@ -26,7 +26,7 @@ "@masknet/web3-shared-evm": "workspace:^", "@masknet/web3-shared-flow": "workspace:^", "@servie/events": "^3.0.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "react-use": "^17.4.0" }, diff --git a/packages/plugins/Gitcoin/package.json b/packages/plugins/Gitcoin/package.json index a319aab952d0..34a30322e094 100644 --- a/packages/plugins/Gitcoin/package.json +++ b/packages/plugins/Gitcoin/package.json @@ -26,11 +26,11 @@ "@masknet/web3-hooks-evm": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-shared-evm": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "quill-delta-to-html": "^0.12.1", "react-use": "^17.4.0", "ts-results-es": "^4.0.0", "urlcat": "^3.1.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Handle/package.json b/packages/plugins/Handle/package.json index f2cee076cfb4..586ccd0648ca 100644 --- a/packages/plugins/Handle/package.json +++ b/packages/plugins/Handle/package.json @@ -25,7 +25,7 @@ "@masknet/web3-providers": "workspace:^", "@masknet/theme": "workspace:^", "react-use": "^17.4.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "unstated-next": "^1.1.0" } } diff --git a/packages/plugins/MaskBox/package.json b/packages/plugins/MaskBox/package.json index 2925cd33f665..6f994d9f1190 100644 --- a/packages/plugins/MaskBox/package.json +++ b/packages/plugins/MaskBox/package.json @@ -28,7 +28,7 @@ "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-shared-evm": "workspace:^", "@types/color": "^3.0.3", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "buffer": "^6.0.3", "color": "^4.2.3", "date-fns": "^2.30.0", @@ -37,7 +37,7 @@ "ts-results-es": "^4.0.0", "unstated-next": "^1.1.0", "urlcat": "^3.1.0", - "web3-eth-abi": "1.8.0", - "web3-utils": "1.8.0" + "web3-eth-abi": "1.10.2", + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/RSS3/package.json b/packages/plugins/RSS3/package.json index d888598ee96f..80952fa6839d 100644 --- a/packages/plugins/RSS3/package.json +++ b/packages/plugins/RSS3/package.json @@ -28,7 +28,7 @@ "@masknet/web3-telemetry": "workspace:^", "@types/use-subscription": "^1.0.0", "@types/uuid": "^9.0.3", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "linkify-react": "^4.1.1", "linkifyjs": "^4.1.1", @@ -36,6 +36,6 @@ "urlcat": "^3.1.0", "use-subscription": "^1.8.0", "uuid": "^9.0.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/RedPacket/package.json b/packages/plugins/RedPacket/package.json index 69805a6bd38b..20a2ae1d773d 100644 --- a/packages/plugins/RedPacket/package.json +++ b/packages/plugins/RedPacket/package.json @@ -28,11 +28,11 @@ "@masknet/web3-shared-evm": "workspace:^", "@masknet/web3-telemetry": "workspace:^", "@react-hookz/web": "^23.1.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "react-use": "^17.4.0", "ts-results-es": "^4.0.0", - "web3-core": "1.8.0", - "web3-utils": "1.8.0" + "web3-core": "1.10.2", + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Savings/package.json b/packages/plugins/Savings/package.json index 24a2b1839941..2acdabd3765d 100644 --- a/packages/plugins/Savings/package.json +++ b/packages/plugins/Savings/package.json @@ -25,10 +25,10 @@ "@masknet/web3-providers": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-shared-evm": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "react-use": "^17.4.0", "ts-results-es": "^4.0.0", - "web3": "1.8.0", - "web3-utils": "1.8.0" + "web3": "1.10.2", + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Tips/package.json b/packages/plugins/Tips/package.json index 88f21fe4b923..4160ac84aee6 100644 --- a/packages/plugins/Tips/package.json +++ b/packages/plugins/Tips/package.json @@ -30,6 +30,6 @@ "ts-results-es": "^4.0.0", "unstated-next": "^1.1.0", "use-subscription": "^1.8.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Trader/package.json b/packages/plugins/Trader/package.json index 4fb99b1ea4f6..edc6d229918f 100644 --- a/packages/plugins/Trader/package.json +++ b/packages/plugins/Trader/package.json @@ -40,7 +40,7 @@ "@uniswap/sdk-core": "^3.0.1", "@uniswap/v2-sdk": "3.0.0-alpha.2", "@uniswap/v3-sdk": "3.9.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "d3": "^5.16.0", "date-fns": "^2.30.0", "json-stable-stringify": "^1.0.2", @@ -49,6 +49,6 @@ "ts-results-es": "^4.0.0", "unstated-next": "^1.1.0", "urlcat": "^3.1.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Web3Profile/package.json b/packages/plugins/Web3Profile/package.json index 0761e6ca0794..8528484901c1 100644 --- a/packages/plugins/Web3Profile/package.json +++ b/packages/plugins/Web3Profile/package.json @@ -33,6 +33,6 @@ "react-use": "^17.4.0", "urlcat": "^3.1.0", "use-subscription": "^1.8.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" } } diff --git a/packages/shared-base/package.json b/packages/shared-base/package.json index 39604a550a9d..b957dd947948 100644 --- a/packages/shared-base/package.json +++ b/packages/shared-base/package.json @@ -24,7 +24,7 @@ "@types/react": "18.2.21", "anchorme": "^2.1.2", "async-call-rpc": "^6.3.1", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "dompurify": "^3.0.5", "history": "^5.3.0", "i18next-browser-languagedetector": "^7.1.0", @@ -34,7 +34,7 @@ "tiny-secp256k1": "^2.2.3", "typeson": "^9.0.3", "typeson-registry": "^8.0.0", - "web3-utils": "1.8.0" + "web3-utils": "1.10.2" }, "devDependencies": { "@types/use-subscription": "^1.0.0" diff --git a/packages/shared/package.json b/packages/shared/package.json index 82f8d7c4e401..b7eb9d6ea686 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -43,7 +43,7 @@ "@types/d3": "5.16.4", "@types/json-stable-stringify": "^1.0.34", "anchorme": "^2.1.2", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "d3": "^5.16.0", "date-fns": "^2.30.0", "iframe-resizer-react": "^1.1.0", @@ -62,8 +62,8 @@ "unstated-next": "^1.1.0", "urlcat": "^3.1.0", "use-subscription": "^1.8.0", - "web3-core-helpers": "1.8.0", - "web3-utils": "1.8.0", + "web3-core-helpers": "1.10.2", + "web3-utils": "1.10.2", "webextension-polyfill": "^0.10.0", "zod": "^3.22.2" }, diff --git a/packages/types/package.json b/packages/types/package.json index 41ff40fb4ae5..513129358711 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -21,7 +21,7 @@ "@masknet/web3-hooks-base": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@types/use-subscription": "^1.0.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "react-use": "^17.4.0", "urlcat": "^3.1.0", diff --git a/packages/web3-contracts/package.json b/packages/web3-contracts/package.json index 49ec7b82bfd7..cc57a8127437 100644 --- a/packages/web3-contracts/package.json +++ b/packages/web3-contracts/package.json @@ -8,11 +8,11 @@ "dependencies": { "@typechain/web3-v1": "^6.0.2", "typechain": "^8.3.1", - "web3-core": "1.8.0" + "web3-core": "1.10.2", + "web3-eth-contract": "1.10.2" }, "devDependencies": { "bn.js": "^4.12.0", - "promievent": "^0.1.5", - "web3-eth-contract": "1.8.0" + "promievent": "^0.1.5" } } diff --git a/packages/web3-hooks/base/package.json b/packages/web3-hooks/base/package.json index 3540bd9a7679..dea7ad500fc2 100644 --- a/packages/web3-hooks/base/package.json +++ b/packages/web3-hooks/base/package.json @@ -23,12 +23,12 @@ "@masknet/web3-telemetry": "workspace:^", "@types/ethereum-blockies": "^0.1.0", "@types/use-subscription": "^1.0.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "ethereum-blockies": "^0.1.1", "lru-cache": "^10.0.0", "react-use": "^17.4.0", "unstated-next": "^1.1.0", "use-subscription": "^1.8.0", - "web3": "1.8.0" + "web3": "1.10.2" } } diff --git a/packages/web3-hooks/evm/package.json b/packages/web3-hooks/evm/package.json index ba4ea66fd9fc..a991c7c36534 100644 --- a/packages/web3-hooks/evm/package.json +++ b/packages/web3-hooks/evm/package.json @@ -20,12 +20,12 @@ "@masknet/web3-shared-flow": "workspace:^", "@masknet/web3-shared-solana": "workspace:^", "@masknet/web3-providers": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "react-use": "^17.4.0", "unstated-next": "^1.1.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-utils": "1.8.0" + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-utils": "1.10.2" } } diff --git a/packages/web3-providers/package.json b/packages/web3-providers/package.json index 9711c6e7c53d..f0a6ec30c351 100644 --- a/packages/web3-providers/package.json +++ b/packages/web3-providers/package.json @@ -72,7 +72,7 @@ "@walletconnect/socket-transport": "1.7.8", "@walletconnect/types": "^2.7.3", "@walletconnect/utils": "^2.7.3", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "bloom-filters": "^3.0.0", "bn.js": "^4.12.0", "bs58": "^5.0.0", @@ -91,12 +91,12 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-core-helpers": "1.8.0", - "web3-eth": "1.8.0", - "web3-eth-abi": "1.8.0", - "web3-utils": "1.8.0", + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-core-helpers": "1.10.2", + "web3-eth": "1.10.2", + "web3-eth-abi": "1.10.2", + "web3-utils": "1.10.2", "zod": "^3.22.2" }, "devDependencies": { diff --git a/packages/web3-shared/base/package.json b/packages/web3-shared/base/package.json index 758e37e921d3..de916a054094 100644 --- a/packages/web3-shared/base/package.json +++ b/packages/web3-shared/base/package.json @@ -15,12 +15,12 @@ "@masknet/public-api": "workspace:^", "@masknet/shared-base": "workspace:^", "@servie/events": "^3.0.0", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "date-fns": "^2.30.0", "react-use": "^17.4.0", "urlcat": "^3.1.0", "millify": "^6.1.0", - "web3-core-helpers": "1.8.0" + "web3-core-helpers": "1.10.2" }, "devDependencies": { "@types/use-subscription": "^1.0.0", diff --git a/packages/web3-shared/evm/package.json b/packages/web3-shared/evm/package.json index 8df6c5425d4f..eca54b689b24 100644 --- a/packages/web3-shared/evm/package.json +++ b/packages/web3-shared/evm/package.json @@ -20,7 +20,7 @@ "@masknet/web3-contracts": "workspace:^", "@masknet/web3-shared-base": "workspace:^", "@masknet/web3-telemetry": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "ethereum-blockies": "^0.1.1", "ethers": "^5.7.2", "date-fns": "^2.30.0", @@ -33,13 +33,13 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.8.0", - "web3-core": "1.8.0", - "web3-core-helpers": "1.8.0", - "web3-eth-abi": "1.8.0", - "web3-eth-accounts": "1.8.0", - "web3-eth-contract": "1.8.0", - "web3-utils": "1.8.0" + "web3": "1.10.2", + "web3-core": "1.10.2", + "web3-core-helpers": "1.10.2", + "web3-eth-abi": "1.10.2", + "web3-eth-accounts": "1.10.2", + "web3-eth-contract": "1.10.2", + "web3-utils": "1.10.2" }, "devDependencies": { "@masknet/injected-script": "*", diff --git a/packages/web3-shared/flow/package.json b/packages/web3-shared/flow/package.json index 3723a15e28f0..970666e687f4 100644 --- a/packages/web3-shared/flow/package.json +++ b/packages/web3-shared/flow/package.json @@ -15,7 +15,7 @@ "@masknet/shared-base": "workspace:^", "@masknet/web3-constants": "workspace:^", "@masknet/web3-shared-base": "workspace:^", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "react-use": "^17.4.0", "urlcat": "^3.1.0" } diff --git a/packages/web3-shared/solana/package.json b/packages/web3-shared/solana/package.json index 2c121e9f6985..112dd22e283f 100644 --- a/packages/web3-shared/solana/package.json +++ b/packages/web3-shared/solana/package.json @@ -20,7 +20,7 @@ "@masknet/web3-shared-base": "workspace:^", "@solana/web3.js": "^1.75.0", "@types/bs58": "^4.0.1", - "bignumber.js": "9.1.1", + "bignumber.js": "9.1.2", "bs58": "^5.0.0", "buffer": "^6.0.3", "react-use": "^17.4.0", From 10c63029bfc6005261baddafe524d2e845935ce0 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Tue, 19 Sep 2023 16:51:59 +0800 Subject: [PATCH 02/13] refactor: remove patches --- package.json | 2 -- patches/web3-core@1.8.0.patch | 13 ------------- patches/web3@1.8.0.patch | 25 ------------------------- 3 files changed, 40 deletions(-) delete mode 100644 patches/web3-core@1.8.0.patch delete mode 100644 patches/web3@1.8.0.patch diff --git a/package.json b/package.json index 7854dce6f431..5ffeaa386e32 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,6 @@ "micromark@3.1.0": "patches/micromark@3.1.0.patch", "micromark-util-symbol@1.0.1": "patches/micromark-util-symbol@1.0.1.patch", "@types/react-avatar-editor@13.0.0": "patches/@types__react-avatar-editor@13.0.0.patch", - "web3@1.8.0": "patches/web3@1.8.0.patch", "fuse.js@6.6.2": "patches/fuse.js@6.6.2.patch", "rss3-next@0.6.17": "patches/rss3-next@0.6.17.patch", "@project-serum/sol-wallet-adapter@0.2.6": "patches/@project-serum__sol-wallet-adapter@0.2.6.patch", @@ -148,7 +147,6 @@ "@walletconnect/client@1.7.8": "patches/@walletconnect__client@1.7.8.patch", "reflect-metadata@0.1.13": "patches/reflect-metadata@0.1.13.patch", "bloom-filters@3.0.0": "patches/bloom-filters@3.0.0.patch", - "web3-core@1.8.0": "patches/web3-core@1.8.0.patch", "urlcat@3.1.0": "patches/urlcat@3.1.0.patch", "@chainsafe/as-sha256@0.3.1": "patches/@chainsafe__as-sha256@0.3.1.patch", "@protobufjs/inquire@1.1.0": "patches/@protobufjs__inquire@1.1.0.patch", diff --git a/patches/web3-core@1.8.0.patch b/patches/web3-core@1.8.0.patch deleted file mode 100644 index 54496d1d0335..000000000000 --- a/patches/web3-core@1.8.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/types/index.d.ts b/types/index.d.ts -index c3be2b5af3ca0d5dd6bbeb3815dbc08bbf60ef89..7de6e3da9d4615e328b2d0bd2f024f698794103b 100644 ---- a/types/index.d.ts -+++ b/types/index.d.ts -@@ -217,7 +217,7 @@ export interface TransactionReceipt { - logs: Log[]; - logsBloom: string; - events?: { -- [eventName: string]: EventLog; -+ [eventName: string]: EventLog | undefined - }; - } - \ No newline at end of file diff --git a/patches/web3@1.8.0.patch b/patches/web3@1.8.0.patch deleted file mode 100644 index cc5e63a4e2a0..000000000000 --- a/patches/web3@1.8.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/package.json b/package.json -index 114dcb5aedd67d4841b1bb68ab80e273f1d05871..2b83be4ce57df05c7cbfb92f5d5beb8cec8d30ba 100644 ---- a/package.json -+++ b/package.json -@@ -8,7 +8,6 @@ - "node": ">=8.0.0" - }, - "main": "lib/index.js", -- "browser": "dist/web3.min.js", - "bugs": { - "url": "https://github.com/ethereum/web3.js/issues" - }, -@@ -18,7 +17,7 @@ - "API" - ], - "author": "ethereum.org", -- "types": "types/index.d.ts", -+ "types": "types/index.d.mts", - "scripts": { - "compile": "tsc -b tsconfig.json", - "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types", -diff --git a/types/index.d.ts b/types/index.d.mts -similarity index 100% -rename from types/index.d.ts -rename to types/index.d.mts \ No newline at end of file From 8c89132873cdc541709e7d1391451316c8836661 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Tue, 19 Sep 2023 16:55:56 +0800 Subject: [PATCH 03/13] chore: update lock file --- pnpm-lock.yaml | 833 +++++++++++++++++++++++++++---------------------- 1 file changed, 462 insertions(+), 371 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 677aa3f5e014..800e401a806f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,12 +95,6 @@ patchedDependencies: urlcat@3.1.0: hash: 5r5xyq4zgcnqugwsrx4lxq2i4e path: patches/urlcat@3.1.0.patch - web3-core@1.8.0: - hash: ie6z5nhvcuo3lg2pk6xeacwpbi - path: patches/web3-core@1.8.0.patch - web3@1.8.0: - hash: dcxxuqxbti2wcxbar42oow5yze - path: patches/web3@1.8.0.patch importers: @@ -973,8 +967,8 @@ importers: specifier: ^6.3.1 version: 6.3.1 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 bip39: specifier: ^3.1.0 version: 3.1.0 @@ -1120,23 +1114,23 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-abi: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-contract: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 webextension-polyfill: specifier: ^0.10.0 version: 0.10.0 @@ -1275,8 +1269,8 @@ importers: specifier: ^6.3.1 version: 6.3.1 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 ethereum-blockies: specifier: ^0.1.1 version: 0.1.1 @@ -1299,17 +1293,17 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 webextension-polyfill: specifier: ^0.10.0 version: 0.10.0 @@ -1353,8 +1347,8 @@ importers: specifier: workspace:^ version: link:../../web3-telemetry bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -1407,8 +1401,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/evm bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -1419,8 +1413,8 @@ importers: specifier: ^3.1.0 version: 3.1.0(patch_hash=5r5xyq4zgcnqugwsrx4lxq2i4e) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/Avatar: dependencies: @@ -1470,8 +1464,8 @@ importers: specifier: ^9.0.3 version: 9.0.3 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 lru-cache: specifier: ^10.0.0 version: 10.0.0 @@ -1569,8 +1563,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/evm bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -1590,8 +1584,8 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/Collectible: dependencies: @@ -1644,8 +1638,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -1785,8 +1779,8 @@ importers: specifier: workspace:^ version: link:../../web3-telemetry bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -1797,11 +1791,11 @@ importers: specifier: ^3.1.0 version: 3.1.0(patch_hash=5r5xyq4zgcnqugwsrx4lxq2i4e) web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/EVM: dependencies: @@ -1860,8 +1854,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 fortmatic: specifier: ^2.2.1 version: 2.2.1(patch_hash=tb3oevqnvhntsyfyhi2z6spuea) @@ -1875,20 +1869,20 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-abi: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 devDependencies: '@types/use-subscription': specifier: ^1.0.0 @@ -2051,8 +2045,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -2158,8 +2152,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/evm bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 quill-delta-to-html: specifier: ^0.12.1 version: 0.12.1 @@ -2173,8 +2167,8 @@ importers: specifier: ^3.1.0 version: 3.1.0(patch_hash=5r5xyq4zgcnqugwsrx4lxq2i4e) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/GoPlusSecurity: dependencies: @@ -2263,8 +2257,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/evm bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -2320,8 +2314,8 @@ importers: specifier: ^3.0.3 version: 3.0.3 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 buffer: specifier: ^6.0.3 version: 6.0.3 @@ -2347,11 +2341,11 @@ importers: specifier: ^3.1.0 version: 3.1.0(patch_hash=5r5xyq4zgcnqugwsrx4lxq2i4e) web3-eth-abi: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/NextID: dependencies: @@ -2515,8 +2509,8 @@ importers: specifier: ^9.0.3 version: 9.0.3 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -2539,8 +2533,8 @@ importers: specifier: ^9.0.0 version: 9.0.0 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/RedPacket: dependencies: @@ -2590,8 +2584,8 @@ importers: specifier: ^23.1.0 version: 23.1.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -2602,11 +2596,11 @@ importers: specifier: ^4.0.0 version: 4.0.0 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/Savings: dependencies: @@ -2647,8 +2641,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/evm bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -2656,11 +2650,11 @@ importers: specifier: ^4.0.0 version: 4.0.0 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/ScamSniffer: dependencies: @@ -2977,8 +2971,8 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/Trader: dependencies: @@ -3064,8 +3058,8 @@ importers: specifier: 3.9.0 version: 3.9.0(patch_hash=i674dmxu47nk67u5bur7yueebu)(hardhat@2.17.2) bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 d3: specifier: ^5.16.0 version: 5.16.0 @@ -3091,8 +3085,8 @@ importers: specifier: ^3.1.0 version: 3.1.0(patch_hash=5r5xyq4zgcnqugwsrx4lxq2i4e) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/Transak: dependencies: @@ -3229,8 +3223,8 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/plugins/template: dependencies: @@ -3499,8 +3493,8 @@ importers: specifier: ^2.1.2 version: 2.1.2 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 d3: specifier: ^5.16.0 version: 5.16.0 @@ -3556,11 +3550,11 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 webextension-polyfill: specifier: ^0.10.0 version: 0.10.0 @@ -3617,8 +3611,8 @@ importers: specifier: ^6.3.1 version: 6.3.1 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 dompurify: specifier: ^3.0.5 version: 3.0.5 @@ -3647,8 +3641,8 @@ importers: specifier: ^8.0.0 version: 8.0.0 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 devDependencies: '@types/use-subscription': specifier: ^1.0.0 @@ -3841,8 +3835,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -3866,13 +3860,16 @@ importers: dependencies: '@typechain/web3-v1': specifier: ^6.0.2 - version: 6.0.2(typechain@8.3.1)(typescript@5.3.0-dev.20230830)(web3-core@1.8.0)(web3-eth-contract@1.8.0)(web3@1.8.0) + version: 6.0.2(typechain@8.3.1)(typescript@5.3.0-dev.20230830)(web3-core@1.10.2)(web3-eth-contract@1.10.2)(web3@1.10.2) typechain: specifier: ^8.3.1 version: 8.3.1(typescript@5.3.0-dev.20230830) web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 + web3-eth-contract: + specifier: 1.10.2 + version: 1.10.2 devDependencies: bn.js: specifier: ^4.12.0 @@ -3880,9 +3877,6 @@ importers: promievent: specifier: ^0.1.5 version: 0.1.5 - web3-eth-contract: - specifier: 1.8.0 - version: 1.8.0 packages/web3-helpers: dependencies: @@ -3941,8 +3935,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 ethereum-blockies: specifier: ^0.1.1 version: 0.1.1 @@ -3959,8 +3953,8 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 packages/web3-hooks/evm: dependencies: @@ -3992,8 +3986,8 @@ importers: specifier: workspace:^ version: link:../../web3-shared/solana bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -4004,14 +3998,14 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 packages/web3-providers: dependencies: @@ -4139,8 +4133,8 @@ importers: specifier: ^2.7.3 version: 2.7.3 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 bloom-filters: specifier: ^3.0.0 version: 3.0.0(patch_hash=2etetjrjxbcye2oktxqpij75ey) @@ -4196,23 +4190,23 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-abi: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 zod: specifier: ^3.22.2 version: 3.22.2 @@ -4242,8 +4236,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -4260,8 +4254,8 @@ importers: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 devDependencies: '@types/use-subscription': specifier: ^1.0.0 @@ -4300,8 +4294,8 @@ importers: specifier: workspace:^ version: link:../../web3-telemetry bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -4339,26 +4333,26 @@ importers: specifier: ^1.0.1 version: 1.0.1 web3: - specifier: 1.8.0 - version: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) + specifier: 1.10.2 + version: 1.10.2 web3-core: - specifier: 1.8.0 - version: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) + specifier: 1.10.2 + version: 1.10.2 web3-core-helpers: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-abi: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-accounts: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-eth-contract: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 web3-utils: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.10.2 + version: 1.10.2 devDependencies: '@masknet/injected-script': specifier: '*' @@ -4391,8 +4385,8 @@ importers: specifier: workspace:^ version: link:../base bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 react-use: specifier: ^17.4.0 version: 17.4.0(react-dom@0.0.0-experimental-0a360642d-20230711)(react@0.0.0-experimental-0a360642d-20230711) @@ -4418,8 +4412,8 @@ importers: specifier: ^4.0.1 version: 4.0.1 bignumber.js: - specifier: 9.1.1 - version: 9.1.1 + specifier: 9.1.2 + version: 9.1.2 bs58: specifier: ^5.0.0 version: 5.0.0 @@ -7839,7 +7833,7 @@ packages: '@ethersproject/providers': 5.7.2 '@ethersproject/solidity': 5.7.0 '@ethersproject/units': 5.7.0 - bignumber.js: 9.1.1 + bignumber.js: 9.1.2 isomorphic-fetch: 2.2.1 transitivePeerDependencies: - bufferutil @@ -9520,6 +9514,13 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true + /@ethereumjs/common@2.5.0: + resolution: {integrity: sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg==} + dependencies: + crc-32: 1.2.2 + ethereumjs-util: 7.1.5 + dev: false + /@ethereumjs/common@2.6.5: resolution: {integrity: sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA==} dependencies: @@ -9533,8 +9534,8 @@ packages: hasBin: true dev: false - /@ethereumjs/tx@3.5.2: - resolution: {integrity: sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw==} + /@ethereumjs/tx@3.3.2: + resolution: {integrity: sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==} dependencies: '@ethereumjs/common': 2.6.5 ethereumjs-util: 7.1.5 @@ -9549,6 +9550,15 @@ packages: ethereum-cryptography: 1.2.0 dev: false + /@ethereumjs/util@8.1.0: + resolution: {integrity: sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==} + engines: {node: '>=14'} + dependencies: + '@ethereumjs/rlp': 4.0.1 + ethereum-cryptography: 2.1.2 + micro-ftch: 0.3.1 + dev: false + /@ethersproject/abi@5.4.0: resolution: {integrity: sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==} dependencies: @@ -9575,6 +9585,7 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 + dev: false /@ethersproject/abstract-provider@5.4.0: resolution: {integrity: sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==} @@ -9598,6 +9609,7 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/transactions': 5.7.0 '@ethersproject/web': 5.7.1 + dev: false /@ethersproject/abstract-signer@5.4.0: resolution: {integrity: sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==} @@ -9617,6 +9629,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 + dev: false /@ethersproject/address@5.4.0: resolution: {integrity: sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==} @@ -9636,6 +9649,7 @@ packages: '@ethersproject/keccak256': 5.7.0 '@ethersproject/logger': 5.7.0 '@ethersproject/rlp': 5.7.0 + dev: false /@ethersproject/base64@5.4.0: resolution: {integrity: sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==} @@ -9647,6 +9661,7 @@ packages: resolution: {integrity: sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==} dependencies: '@ethersproject/bytes': 5.7.0 + dev: false /@ethersproject/basex@5.4.0: resolution: {integrity: sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==} @@ -9676,6 +9691,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 bn.js: 5.2.1 + dev: false /@ethersproject/bytes@5.4.0: resolution: {integrity: sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==} @@ -9687,6 +9703,7 @@ packages: resolution: {integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==} dependencies: '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/constants@5.4.0: resolution: {integrity: sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==} @@ -9698,6 +9715,7 @@ packages: resolution: {integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==} dependencies: '@ethersproject/bignumber': 5.7.0 + dev: false /@ethersproject/contracts@5.4.0: resolution: {integrity: sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==} @@ -9754,6 +9772,7 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 + dev: false /@ethersproject/hdnode@5.4.0: resolution: {integrity: sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==} @@ -9837,6 +9856,7 @@ packages: dependencies: '@ethersproject/bytes': 5.7.0 js-sha3: 0.8.0 + dev: false /@ethersproject/logger@5.4.0: resolution: {integrity: sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==} @@ -9844,6 +9864,7 @@ packages: /@ethersproject/logger@5.7.0: resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==} + dev: false /@ethersproject/networks@5.4.1: resolution: {integrity: sha512-8SvowCKz9Uf4xC5DTKI8+il8lWqOr78kmiqAVLYT9lzB8aSmJHQMD1GSuJI0CW4hMAnzocpGpZLgiMdzsNSPig==} @@ -9855,6 +9876,7 @@ packages: resolution: {integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==} dependencies: '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/pbkdf2@5.4.0: resolution: {integrity: sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==} @@ -9880,6 +9902,7 @@ packages: resolution: {integrity: sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==} dependencies: '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/providers@5.7.2: resolution: {integrity: sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==} @@ -9935,6 +9958,7 @@ packages: dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/sha2@5.4.0: resolution: {integrity: sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==} @@ -9972,6 +9996,7 @@ packages: bn.js: 5.2.1 elliptic: 6.5.4 hash.js: 1.1.7 + dev: false /@ethersproject/solidity@5.4.0: resolution: {integrity: sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==} @@ -10008,6 +10033,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.7.0 '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/transactions@5.4.0: resolution: {integrity: sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==} @@ -10035,6 +10061,7 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/rlp': 5.7.0 '@ethersproject/signing-key': 5.7.0 + dev: false /@ethersproject/units@5.4.0: resolution: {integrity: sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==} @@ -10110,6 +10137,7 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 + dev: false /@ethersproject/wordlists@5.4.0: resolution: {integrity: sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==} @@ -10901,7 +10929,7 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: false /@metamask/safe-event-emitter@2.0.0: @@ -11627,6 +11655,12 @@ packages: engines: {node: '>= 11'} dev: true + /@noble/curves@1.1.0: + resolution: {integrity: sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==} + dependencies: + '@noble/hashes': 1.3.1 + dev: false + /@noble/curves@1.2.0: resolution: {integrity: sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==} dependencies: @@ -11641,6 +11675,11 @@ packages: resolution: {integrity: sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==} dev: false + /@noble/hashes@1.3.1: + resolution: {integrity: sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==} + engines: {node: '>= 16'} + dev: false + /@noble/hashes@1.3.2: resolution: {integrity: sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==} engines: {node: '>= 16'} @@ -12433,6 +12472,14 @@ packages: '@scure/base': 1.1.1 dev: false + /@scure/bip32@1.3.1: + resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==} + dependencies: + '@noble/curves': 1.1.0 + '@noble/hashes': 1.3.2 + '@scure/base': 1.1.1 + dev: false + /@scure/bip39@1.1.1: resolution: {integrity: sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==} dependencies: @@ -12440,6 +12487,13 @@ packages: '@scure/base': 1.1.1 dev: false + /@scure/bip39@1.2.1: + resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} + dependencies: + '@noble/hashes': 1.3.2 + '@scure/base': 1.1.1 + dev: false + /@sentry-internal/tracing@7.66.0: resolution: {integrity: sha512-3vCgC2hC3T45pn53yTDVcRpHoJTBxelDPPZVsipAbZnoOVPkj7n6dNfDhj3I3kwWCBPahPkXmE+R4xViR8VqJg==} engines: {node: '>=8'} @@ -12628,7 +12682,7 @@ packages: '@solana/buffer-layout': 4.0.1 '@solana/web3.js': 1.78.4 bigint-buffer: 1.1.5 - bignumber.js: 9.1.1 + bignumber.js: 9.1.2 transitivePeerDependencies: - bufferutil - encoding @@ -14574,7 +14628,7 @@ packages: /@tsconfig/node16@1.0.3: resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==} - /@typechain/web3-v1@6.0.2(typechain@8.3.1)(typescript@5.3.0-dev.20230830)(web3-core@1.8.0)(web3-eth-contract@1.8.0)(web3@1.8.0): + /@typechain/web3-v1@6.0.2(typechain@8.3.1)(typescript@5.3.0-dev.20230830)(web3-core@1.10.2)(web3-eth-contract@1.10.2)(web3@1.10.2): resolution: {integrity: sha512-jiI15w1yZwXbXpcL4bHmtpOFWrOgmWQAeNHtzPiC2fHYNzxcJWB8E1KdWf30TAR2I9uT5fx10butLZYeHV1lNQ==} peerDependencies: typechain: ^8.1.1 @@ -14585,9 +14639,9 @@ packages: lodash: 4.17.21 ts-essentials: 7.0.2(typescript@5.3.0-dev.20230830) typechain: 8.3.1(typescript@5.3.0-dev.20230830) - web3: 1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze) - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-eth-contract: 1.8.0 + web3: 1.10.2 + web3-core: 1.10.2 + web3-eth-contract: 1.10.2 transitivePeerDependencies: - typescript dev: false @@ -14635,6 +14689,7 @@ packages: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: '@types/node': 20.5.7 + dev: false /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} @@ -15172,6 +15227,7 @@ packages: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: '@types/node': 20.5.7 + dev: false /@types/prettier@2.7.3: resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} @@ -15306,6 +15362,7 @@ packages: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: '@types/node': 20.5.7 + dev: false /@types/semver@7.5.0: resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==} @@ -15896,7 +15953,7 @@ packages: '@walletconnect/safe-json': 1.0.2 events: 3.3.0 tslib: 1.14.1 - ws: 7.5.7 + ws: 7.5.9 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -16383,8 +16440,9 @@ packages: dependencies: event-target-shim: 5.0.1 - /abortcontroller-polyfill@1.7.3: - resolution: {integrity: sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==} + /abortcontroller-polyfill@1.7.5: + resolution: {integrity: sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==} + dev: false /abstract-level@1.0.3: resolution: {integrity: sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA==} @@ -16836,7 +16894,7 @@ packages: engines: {node: '>=10'} dependencies: delegates: 1.0.0 - readable-stream: 3.6.0 + readable-stream: 3.6.2 dev: true /arg@4.1.3: @@ -17092,7 +17150,7 @@ packages: arconnect: 0.4.2 asn1.js: 5.4.1 base64-js: 1.5.1 - bignumber.js: 9.1.1 + bignumber.js: 9.1.2 dev: false /asn1.js@5.4.1: @@ -17731,8 +17789,9 @@ packages: engines: {node: '>=14.0.0'} dev: false - /bignumber.js@9.1.1: - resolution: {integrity: sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==} + /bignumber.js@9.1.2: + resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==} + dev: false /binary-extensions@1.13.1: resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==} @@ -17759,11 +17818,12 @@ packages: dependencies: buffer: 5.7.1 inherits: 2.0.4 - readable-stream: 3.6.0 + readable-stream: 3.6.2 dev: true /blakejs@1.1.1: resolution: {integrity: sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg==} + dev: false /blob-to-it@2.0.2: resolution: {integrity: sha512-/x5Kmy+KEO3WpN9DulU9NA73lRaKUqlJGiQwq8mMUSg43IRMmidmRF0sT+6p6PBbAf4wtPJLHFjZVcN+kyC8eg==} @@ -17797,6 +17857,7 @@ packages: /bn.js@4.11.6: resolution: {integrity: sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==} + dev: false /bn.js@4.11.8: resolution: {integrity: sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==} @@ -17847,13 +17908,13 @@ packages: resolution: {integrity: sha512-Sy9eoUi4OiKzq7VovMn246iTo17kzuyHJKomCfpWMlI6RpfN1gk95w7d7gH264nApVLg0HZfcpz62/g4VH1Y4w==} engines: {node: '>=4'} dependencies: - bignumber.js: 9.1.1 + bignumber.js: 9.1.2 buffer: 5.7.1 commander: 2.20.3 ieee754: 1.2.1 iso-url: 0.4.7 json-text-sequence: 0.1.1 - readable-stream: 3.6.0 + readable-stream: 3.6.2 dev: false /boring-avatars@1.6.3: @@ -18076,6 +18137,7 @@ packages: resolution: {integrity: sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==} dependencies: base-x: 3.0.9 + dev: false /bs58@5.0.0: resolution: {integrity: sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==} @@ -18089,6 +18151,7 @@ packages: bs58: 4.0.1 create-hash: 1.2.0 safe-buffer: 5.2.1 + dev: false /bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} @@ -18330,7 +18393,7 @@ packages: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: function-bind: 1.1.1 - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 /call-me-maybe@1.0.2: resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==} @@ -18856,7 +18919,7 @@ packages: dependencies: inherits: 2.0.4 process-nextick-args: 2.0.1 - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: true /clsx@1.2.1: @@ -19491,6 +19554,7 @@ packages: node-fetch: 2.7.0 transitivePeerDependencies: - encoding + dev: false /cross-fetch@4.0.0: resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} @@ -19498,7 +19562,6 @@ packages: node-fetch: 2.7.0 transitivePeerDependencies: - encoding - dev: true /cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} @@ -20857,7 +20920,7 @@ packages: /duplexer2@0.1.4: resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==} dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: false /duplexer@0.1.2: @@ -20869,7 +20932,7 @@ packages: dependencies: end-of-stream: 1.4.4 inherits: 2.0.4 - readable-stream: 2.3.7 + readable-stream: 2.3.8 stream-shift: 1.0.1 dev: true @@ -20878,7 +20941,7 @@ packages: dependencies: end-of-stream: 1.4.4 inherits: 2.0.4 - readable-stream: 3.6.0 + readable-stream: 3.6.2 stream-shift: 1.0.1 dev: false @@ -21129,7 +21192,7 @@ packages: es-to-primitive: 1.2.1 function-bind: 1.1.1 function.prototype.name: 1.1.5 - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 get-symbol-description: 1.0.0 has: 1.0.3 has-property-descriptors: 1.0.0 @@ -21288,6 +21351,7 @@ packages: /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} + dev: false /es6-promisify@5.0.0: resolution: {integrity: sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==} @@ -21874,6 +21938,7 @@ packages: resolution: {integrity: sha512-rxJ5OFN3RwjQxDcFP2Z5+Q9ho4eIdEmSc2ht0fCu8Se9nbXjZ7/031uXoUYJ87KHCOdVeiUuwSnoS7hmYAGVHA==} dependencies: js-sha3: 0.8.0 + dev: false /ethereum-cryptography@0.1.3: resolution: {integrity: sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==} @@ -21886,13 +21951,14 @@ packages: create-hash: 1.2.0 create-hmac: 1.1.7 hash.js: 1.1.7 - keccak: 3.0.2 + keccak: 3.0.3 pbkdf2: 3.1.2 randombytes: 2.1.0 safe-buffer: 5.2.1 scrypt-js: 3.0.1 secp256k1: 4.0.2 setimmediate: 1.0.5 + dev: false /ethereum-cryptography@1.2.0: resolution: {integrity: sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==} @@ -21903,6 +21969,15 @@ packages: '@scure/bip39': 1.1.1 dev: false + /ethereum-cryptography@2.1.2: + resolution: {integrity: sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==} + dependencies: + '@noble/curves': 1.1.0 + '@noble/hashes': 1.3.1 + '@scure/bip32': 1.3.1 + '@scure/bip39': 1.2.1 + dev: false + /ethereumjs-abi@0.6.8: resolution: {integrity: sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==} dependencies: @@ -21931,6 +22006,7 @@ packages: create-hash: 1.2.0 ethereum-cryptography: 0.1.3 rlp: 2.2.7 + dev: false /ethers@5.4.1: resolution: {integrity: sha512-SrcddMdCgP1hukDvCPd87Aipbf4NWjQvdfAbZ65XSZGbfyuYPtIrUJPDH5B1SBRsdlfiEgX3eoz28DdBDzMNFg==} @@ -22014,6 +22090,7 @@ packages: dependencies: bn.js: 4.11.6 number-to-bn: 1.7.0 + dev: false /ethjs-util@0.1.6: resolution: {integrity: sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==} @@ -22045,6 +22122,7 @@ packages: /eventemitter3@4.0.4: resolution: {integrity: sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==} + dev: false /eventemitter3@4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} @@ -22665,7 +22743,7 @@ packages: resolution: {integrity: sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==} dependencies: inherits: 2.0.4 - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: true /follow-redirects@1.15.2(debug@4.3.4): @@ -22683,7 +22761,6 @@ packages: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} dependencies: is-callable: 1.2.7 - dev: true /for-in@1.0.2: resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} @@ -22699,6 +22776,7 @@ packages: /foreach@2.0.5: resolution: {integrity: sha512-ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA==} + dev: false /foreground-child@2.0.0: resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==} @@ -23119,13 +23197,6 @@ packages: resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} dev: true - /get-intrinsic@1.1.3: - resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==} - dependencies: - function-bind: 1.1.1 - has: 1.0.3 - has-symbols: 1.0.3 - /get-intrinsic@1.2.1: resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} dependencies: @@ -23133,7 +23204,6 @@ packages: has: 1.0.3 has-proto: 1.0.1 has-symbols: 1.0.3 - dev: true /get-iterator@1.0.2: resolution: {integrity: sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg==} @@ -23175,7 +23245,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 /get-tsconfig@4.7.0: resolution: {integrity: sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==} @@ -23248,7 +23318,7 @@ packages: is-negated-glob: 1.0.0 ordered-read-streams: 1.0.1 pumpify: 1.5.1 - readable-stream: 2.3.7 + readable-stream: 2.3.8 remove-trailing-separator: 1.1.0 to-absolute-glob: 2.0.2 unique-stream: 2.3.1 @@ -23487,7 +23557,6 @@ packages: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: get-intrinsic: 1.2.1 - dev: true /got@11.8.5: resolution: {integrity: sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==} @@ -23808,12 +23877,11 @@ packages: /has-property-descriptors@1.0.0: resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} dependencies: - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 /has-proto@1.0.1: resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} engines: {node: '>= 0.4'} - dev: true /has-symbols@1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} @@ -23876,7 +23944,7 @@ packages: engines: {node: '>=4'} dependencies: inherits: 2.0.4 - readable-stream: 3.6.0 + readable-stream: 3.6.2 safe-buffer: 5.2.1 /hash.js@1.1.7: @@ -24076,7 +24144,7 @@ packages: dependencies: inherits: 2.0.4 obuf: 1.1.2 - readable-stream: 2.3.7 + readable-stream: 2.3.8 wbuf: 1.7.3 dev: true @@ -24250,6 +24318,7 @@ packages: /http-https@1.0.0: resolution: {integrity: sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg==} + dev: false /http-parser-js@0.5.8: resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} @@ -24624,7 +24693,7 @@ packages: resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 has: 1.0.3 side-channel: 1.0.4 @@ -25096,6 +25165,7 @@ packages: /is-hex-prefixed@1.0.0: resolution: {integrity: sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==} engines: {node: '>=6.5.0', npm: '>=3'} + dev: false /is-hexadecimal@1.0.4: resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==} @@ -25312,7 +25382,6 @@ packages: engines: {node: '>= 0.4'} dependencies: which-typed-array: 1.1.11 - dev: true /is-typed-array@1.1.8: resolution: {integrity: sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==} @@ -25323,6 +25392,7 @@ packages: es-abstract: 1.20.4 foreach: 2.0.5 has-tostringtag: 1.0.0 + dev: false /is-typedarray@1.0.0: resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} @@ -25589,7 +25659,7 @@ packages: get-iterator: 1.0.2 p-defer: 3.0.0 p-fifo: 1.0.0 - readable-stream: 3.6.0 + readable-stream: 3.6.2 dev: false /iterate-iterator@1.0.2: @@ -26208,6 +26278,7 @@ packages: /js-sha3@0.8.0: resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==} + dev: false /js-string-escape@1.0.1: resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} @@ -26328,7 +26399,7 @@ packages: resolution: {integrity: sha512-JmZmlehE0xF3swwORpLHny/GvW3MZxCsb2uFNBrn8TOqMqivzCfz232NSDLLOtIQlrPlgyEjiYpyzyOPFOzClw==} dependencies: '@metamask/safe-event-emitter': 2.0.0 - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: false /json-schema-traverse@0.4.1: @@ -26435,7 +26506,7 @@ packages: dependencies: lie: 3.3.0 pako: 1.0.11 - readable-stream: 2.3.7 + readable-stream: 2.3.8 setimmediate: 1.0.5 dev: true @@ -26470,6 +26541,7 @@ packages: node-addon-api: 2.0.2 node-gyp-build: 4.3.0 readable-stream: 3.6.0 + dev: false /keccak@3.0.3: resolution: {integrity: sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ==} @@ -26593,7 +26665,7 @@ packages: resolution: {integrity: sha512-/330KFbmC/zKdtZoVDRwvkJ8snrJyBPfoZ39zsJl2O24HOE1CTNiEbeZmHXmjBVxTSSv7JlJEXPYhU83DhA2yg==} engines: {node: '>= 0.6.3'} dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: true /lcid@1.0.0: @@ -27457,17 +27529,21 @@ packages: resolution: {integrity: sha512-lin42tKfRdkW+6iE5pjtQ9BnH+1Hk3sJ5Fn9hUUSjcXRcJbSISHgPCfYvMNEXiNqZPhz/TyRPEV30qgnujsQ7A==} engines: {node: '>= 7.6.0'} dependencies: - bignumber.js: 9.1.1 + bignumber.js: 9.1.2 buffer-reverse: 1.0.1 crypto-js: 3.3.0 treeify: 1.1.0 - web3-utils: 1.8.0 + web3-utils: 1.10.2 dev: false /methods@1.1.2: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} + /micro-ftch@0.3.1: + resolution: {integrity: sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==} + dev: false + /microevent.ts@0.1.1: resolution: {integrity: sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==} dev: true @@ -28419,6 +28495,7 @@ packages: /node-addon-api@2.0.2: resolution: {integrity: sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==} + dev: false /node-dir@0.1.17: resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==} @@ -28516,7 +28593,7 @@ packages: process: 0.11.10 punycode: 1.4.1 querystring-es3: 0.2.1 - readable-stream: 2.3.7 + readable-stream: 2.3.8 stream-browserify: 2.0.2 stream-http: 2.8.3 string_decoder: 1.3.0 @@ -28669,6 +28746,7 @@ packages: dependencies: bn.js: 4.11.6 strip-hex-prefix: 1.0.0 + dev: false /nwsapi@2.2.1: resolution: {integrity: sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==} @@ -28834,6 +28912,7 @@ packages: resolution: {integrity: sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA==} dependencies: http-https: 1.0.0 + dev: false /obuf@1.1.2: resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==} @@ -28938,7 +29017,7 @@ packages: /ordered-read-streams@1.0.1: resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==} dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: true /os-browserify@0.3.0: @@ -30632,7 +30711,7 @@ packages: dependencies: deep-extend: 0.6.0 ini: 1.3.8 - minimist: 1.2.7 + minimist: 1.2.8 strip-json-comments: 2.0.1 dev: true @@ -31162,7 +31241,6 @@ packages: safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 - dev: true /readable-stream@3.6.0: resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==} @@ -31196,7 +31274,7 @@ packages: dependencies: graceful-fs: 4.2.11 micromatch: 3.1.10 - readable-stream: 2.3.7 + readable-stream: 2.3.8 transitivePeerDependencies: - supports-color dev: true @@ -31816,6 +31894,7 @@ packages: hasBin: true dependencies: bn.js: 5.2.1 + dev: false /rollup-plugin-swc3@0.10.1(@swc/core@1.3.81)(rollup@3.28.1): resolution: {integrity: sha512-cRjkK5CqqOO1GTPPcdxPqczR5YNibxKyO7OY1tWbHzEhd/VDlnc30WROdnvz6wc13dJg3HO8xGUfjIvyZTx+Gg==} @@ -32015,7 +32094,7 @@ packages: resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} dependencies: call-bind: 1.0.2 - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 is-regex: 1.1.4 /safe-regex@1.1.0: @@ -32119,6 +32198,7 @@ packages: /scrypt-js@3.0.1: resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==} + dev: false /secp256k1@4.0.2: resolution: {integrity: sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==} @@ -32126,7 +32206,8 @@ packages: dependencies: elliptic: 6.5.4 node-addon-api: 2.0.2 - node-gyp-build: 4.3.0 + node-gyp-build: 4.6.1 + dev: false /seedrandom@3.0.5: resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==} @@ -32375,7 +32456,7 @@ packages: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: call-bind: 1.0.2 - get-intrinsic: 1.1.3 + get-intrinsic: 1.2.1 object-inspect: 1.12.3 /siginfo@2.0.0: @@ -32894,7 +32975,7 @@ packages: resolution: {integrity: sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==} dependencies: inherits: 2.0.4 - readable-stream: 2.3.7 + readable-stream: 2.3.8 dev: true /stream-browserify@3.0.0: @@ -33175,6 +33256,7 @@ packages: engines: {node: '>=6.5.0', npm: '>=3'} dependencies: is-hex-prefixed: 1.0.0 + dev: false /strip-indent@1.0.1: resolution: {integrity: sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==} @@ -33670,7 +33752,7 @@ packages: /through2@2.0.5: resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==} dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 xtend: 4.0.2 dev: true @@ -34850,6 +34932,7 @@ packages: /utf8@3.0.0: resolution: {integrity: sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==} + dev: false /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -34881,6 +34964,7 @@ packages: is-typed-array: 1.1.8 safe-buffer: 5.2.1 which-typed-array: 1.1.7 + dev: false /util@0.12.5: resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==} @@ -34888,9 +34972,8 @@ packages: inherits: 2.0.4 is-arguments: 1.1.1 is-generator-function: 1.0.10 - is-typed-array: 1.1.8 - which-typed-array: 1.1.7 - dev: true + is-typed-array: 1.1.12 + which-typed-array: 1.1.11 /utila@0.4.0: resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} @@ -34904,12 +34987,6 @@ packages: resolution: {integrity: sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==} dev: true - /uuid@3.3.2: - resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==} - deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. - hasBin: true - dev: false - /uuid@3.4.0: resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==} deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. @@ -35381,8 +35458,8 @@ packages: engines: {node: '>= 8'} dev: true - /web3-bzz@1.8.0: - resolution: {integrity: sha512-caDtdKeLi7+2Vb+y+cq2yyhkNjnxkFzVW0j1DtemarBg3dycG1iEl75CVQMLNO6Wkg+HH9tZtRnUyFIe5LIUeQ==} + /web3-bzz@1.10.2: + resolution: {integrity: sha512-vLOfDCj6198Qc7esDrCKeFA/M3ZLbowsaHQ0hIL4NmIHoq7lU8aSRTa5AI+JBh8cKN1gVryJsuW2ZCc5bM4I4Q==} engines: {node: '>=8.0.0'} dependencies: '@types/node': 20.5.7 @@ -35394,251 +35471,262 @@ packages: - utf-8-validate dev: false - /web3-core-helpers@1.8.0: - resolution: {integrity: sha512-nMAVwZB3rEp/khHI2BvFy0e/xCryf501p5NGjswmJtEM+Zrd3Biaw52JrB1qAZZIzCA8cmLKaOgdfamoDOpWdw==} + /web3-core-helpers@1.10.2: + resolution: {integrity: sha512-1JfaNtox6/ZYJHNoI+QVc2ObgwEPeGF+YdxHZQ7aF5605BmlwM1Bk3A8xv6mg64jIRvEq1xX6k9oG6x7p1WgXQ==} engines: {node: '>=8.0.0'} dependencies: - web3-eth-iban: 1.8.0 - web3-utils: 1.8.0 + web3-eth-iban: 1.10.2 + web3-utils: 1.10.2 + dev: false - /web3-core-method@1.8.0: - resolution: {integrity: sha512-c94RAzo3gpXwf2rf8rL8C77jOzNWF4mXUoUfZYYsiY35cJFd46jQDPI00CB5+ZbICTiA5mlVzMj4e7jAsTqiLA==} + /web3-core-method@1.10.2: + resolution: {integrity: sha512-gG6ES+LOuo01MJHML4gnEt702M8lcPGMYZoX8UjZzmEebGrPYOY9XccpCrsFgCeKgQzM12SVnlwwpMod1+lcLg==} engines: {node: '>=8.0.0'} dependencies: '@ethersproject/transactions': 5.7.0 - web3-core-helpers: 1.8.0 - web3-core-promievent: 1.8.0 - web3-core-subscriptions: 1.8.0 - web3-utils: 1.8.0 + web3-core-helpers: 1.10.2 + web3-core-promievent: 1.10.2 + web3-core-subscriptions: 1.10.2 + web3-utils: 1.10.2 + dev: false - /web3-core-promievent@1.8.0: - resolution: {integrity: sha512-FGLyjAuOaAQ+ZhV6iuw9tg/9WvIkSZXKHQ4mdTyQ8MxVraOtFivOCbuLLsGgapfHYX+RPxsc1j1YzQjKoupagQ==} + /web3-core-promievent@1.10.2: + resolution: {integrity: sha512-Qkkb1dCDOU8dZeORkcwJBQRAX+mdsjx8LqFBB+P4W9QgwMqyJ6LXda+y1XgyeEVeKEmY1RCeTq9Y94q1v62Sfw==} engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.4 + dev: false - /web3-core-requestmanager@1.8.0: - resolution: {integrity: sha512-2AoYCs3Owl5foWcf4uKPONyqFygSl9T54L8b581U16nsUirjhoTUGK/PBhMDVcLCmW4QQmcY5A8oPFpkQc1TTg==} + /web3-core-requestmanager@1.10.2: + resolution: {integrity: sha512-nlLeNJUu6fR+ZbJr2k9Du/nN3VWwB4AJPY4r6nxUODAmykgJq57T21cLP/BEk6mbiFQYGE9TrrPhh4qWxQEtAw==} engines: {node: '>=8.0.0'} dependencies: - util: 0.12.4 - web3-core-helpers: 1.8.0 - web3-providers-http: 1.8.0 - web3-providers-ipc: 1.8.0 - web3-providers-ws: 1.8.0 + util: 0.12.5 + web3-core-helpers: 1.10.2 + web3-providers-http: 1.10.2 + web3-providers-ipc: 1.10.2 + web3-providers-ws: 1.10.2 transitivePeerDependencies: - encoding - supports-color + dev: false - /web3-core-subscriptions@1.8.0: - resolution: {integrity: sha512-7lHVRzDdg0+Gcog55lG6Q3D8JV+jN+4Ly6F8cSn9xFUAwOkdbgdWsjknQG7t7CDWy21DQkvdiY2BJF8S68AqOA==} + /web3-core-subscriptions@1.10.2: + resolution: {integrity: sha512-MiWcKjz4tco793EPPPLc/YOJmYUV3zAfxeQH/UVTfBejMfnNvmfwKa2SBKfPIvKQHz/xI5bV2TF15uvJEucU7w==} engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.4 - web3-core-helpers: 1.8.0 + web3-core-helpers: 1.10.2 + dev: false - /web3-core@1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi): - resolution: {integrity: sha512-9sCA+Z02ci6zoY2bAquFiDjujRwmSKHiSGi4B8IstML8okSytnzXk1izHYSynE7ahIkguhjWAuXFvX76F5rAbA==} + /web3-core@1.10.2: + resolution: {integrity: sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==} engines: {node: '>=8.0.0'} dependencies: '@types/bn.js': 5.1.1 '@types/node': 20.5.7 - bignumber.js: 9.1.1 - web3-core-helpers: 1.8.0 - web3-core-method: 1.8.0 - web3-core-requestmanager: 1.8.0 - web3-utils: 1.8.0 + bignumber.js: 9.1.2 + web3-core-helpers: 1.10.2 + web3-core-method: 1.10.2 + web3-core-requestmanager: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color - patched: true + dev: false - /web3-eth-abi@1.8.0: - resolution: {integrity: sha512-xPeMb2hS9YLQK/Q5YZpkcmzoRGM+/R8bogSrYHhNC3hjZSSU0YRH+1ZKK0f9YF4qDZaPMI8tKWIMSCDIpjG6fg==} + /web3-eth-abi@1.10.2: + resolution: {integrity: sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==} engines: {node: '>=8.0.0'} dependencies: '@ethersproject/abi': 5.7.0 - web3-utils: 1.8.0 + web3-utils: 1.10.2 + dev: false - /web3-eth-accounts@1.8.0: - resolution: {integrity: sha512-HQ/MDSv4bexwJLvnqsM6xpGE7c2NVOqyhzOZFyMUKXbIwIq85T3TaLnM9pCN7XqMpDcfxqiZ3q43JqQVkzHdmw==} + /web3-eth-accounts@1.10.2: + resolution: {integrity: sha512-6/HhCBYAXN/f553/SyxS9gY62NbLgpD1zJpENcvRTDpJN3Znvli1cmpl5Q3ZIUJkvHnG//48EWfWh0cbb3fbKQ==} engines: {node: '>=8.0.0'} dependencies: - '@ethereumjs/common': 2.6.5 - '@ethereumjs/tx': 3.5.2 - crypto-browserify: 3.12.0 + '@ethereumjs/common': 2.5.0 + '@ethereumjs/tx': 3.3.2 + '@ethereumjs/util': 8.1.0 eth-lib: 0.2.8 - ethereumjs-util: 7.1.5 scrypt-js: 3.0.1 - uuid: 3.3.2 - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-helpers: 1.8.0 - web3-core-method: 1.8.0 - web3-utils: 1.8.0 + uuid: 9.0.0 + web3-core: 1.10.2 + web3-core-helpers: 1.10.2 + web3-core-method: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-eth-contract@1.8.0: - resolution: {integrity: sha512-6xeXhW2YoCrz2Ayf2Vm4srWiMOB6LawkvxWJDnUWJ8SMATg4Pgu42C/j8rz/enXbYWt2IKuj0kk8+QszxQbK+Q==} + /web3-eth-contract@1.10.2: + resolution: {integrity: sha512-CZLKPQRmupP/+OZ5A/CBwWWkBiz5B/foOpARz0upMh1yjb0dEud4YzRW2gJaeNu0eGxDLsWVaXhUimJVGYprQw==} engines: {node: '>=8.0.0'} dependencies: '@types/bn.js': 5.1.1 - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-helpers: 1.8.0 - web3-core-method: 1.8.0 - web3-core-promievent: 1.8.0 - web3-core-subscriptions: 1.8.0 - web3-eth-abi: 1.8.0 - web3-utils: 1.8.0 + web3-core: 1.10.2 + web3-core-helpers: 1.10.2 + web3-core-method: 1.10.2 + web3-core-promievent: 1.10.2 + web3-core-subscriptions: 1.10.2 + web3-eth-abi: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color + dev: false - /web3-eth-ens@1.8.0: - resolution: {integrity: sha512-/eFbQEwvsMOEiOhw9/iuRXCsPkqAmHHWuFOrThQkozRgcnSTRnvxkkRC/b6koiT5/HaKeUs4yQDg+/ixsIxZxA==} + /web3-eth-ens@1.10.2: + resolution: {integrity: sha512-kTQ42UdNHy4BQJHgWe97bHNMkc3zCMBKKY7t636XOMxdI/lkRdIjdE5nQzt97VjQvSVasgIWYKRAtd8aRaiZiQ==} engines: {node: '>=8.0.0'} dependencies: content-hash: 2.5.2 eth-ens-namehash: 2.0.8 - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-helpers: 1.8.0 - web3-core-promievent: 1.8.0 - web3-eth-abi: 1.8.0 - web3-eth-contract: 1.8.0 - web3-utils: 1.8.0 + web3-core: 1.10.2 + web3-core-helpers: 1.10.2 + web3-core-promievent: 1.10.2 + web3-eth-abi: 1.10.2 + web3-eth-contract: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-eth-iban@1.8.0: - resolution: {integrity: sha512-4RbvUxcMpo/e5811sE3a6inJ2H4+FFqUVmlRYs0RaXaxiHweahSRBNcpO0UWgmlePTolj0rXqPT2oEr0DuC8kg==} + /web3-eth-iban@1.10.2: + resolution: {integrity: sha512-y8+Ii2XXdyHQMFNL2NWpBnXe+TVJ4ryvPlzNhObRRnIo4O4nLIXS010olLDMayozDzoUlmzCmBZJYc9Eev1g7A==} engines: {node: '>=8.0.0'} dependencies: bn.js: 5.2.1 - web3-utils: 1.8.0 + web3-utils: 1.10.2 + dev: false - /web3-eth-personal@1.8.0: - resolution: {integrity: sha512-L7FT4nR3HmsfZyIAhFpEctKkYGOjRC2h6iFKs9gnFCHZga8yLcYcGaYOBIoYtaKom99MuGBoosayWt/Twh7F5A==} + /web3-eth-personal@1.10.2: + resolution: {integrity: sha512-+vEbJsPUJc5J683y0c2aN645vXC+gPVlFVCQu4IjPvXzJrAtUfz26+IZ6AUOth4fDJPT0f1uSLS5W2yrUdw9BQ==} engines: {node: '>=8.0.0'} dependencies: '@types/node': 20.5.7 - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-helpers: 1.8.0 - web3-core-method: 1.8.0 - web3-net: 1.8.0 - web3-utils: 1.8.0 + web3-core: 1.10.2 + web3-core-helpers: 1.10.2 + web3-core-method: 1.10.2 + web3-net: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-eth@1.8.0: - resolution: {integrity: sha512-hist52os3OT4TQFB/GxPSMxTh3995sz6LPvQpPvj7ktSbpg9RNSFaSsPlCT63wUAHA3PZb1FemkAIeQM5t72Lw==} + /web3-eth@1.10.2: + resolution: {integrity: sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-helpers: 1.8.0 - web3-core-method: 1.8.0 - web3-core-subscriptions: 1.8.0 - web3-eth-abi: 1.8.0 - web3-eth-accounts: 1.8.0 - web3-eth-contract: 1.8.0 - web3-eth-ens: 1.8.0 - web3-eth-iban: 1.8.0 - web3-eth-personal: 1.8.0 - web3-net: 1.8.0 - web3-utils: 1.8.0 + web3-core: 1.10.2 + web3-core-helpers: 1.10.2 + web3-core-method: 1.10.2 + web3-core-subscriptions: 1.10.2 + web3-eth-abi: 1.10.2 + web3-eth-accounts: 1.10.2 + web3-eth-contract: 1.10.2 + web3-eth-ens: 1.10.2 + web3-eth-iban: 1.10.2 + web3-eth-personal: 1.10.2 + web3-net: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-net@1.8.0: - resolution: {integrity: sha512-kX6EAacK7QrOe7DOh0t5yHS5q2kxZmTCxPVwSz9io9xBeE4n4UhmzGJ/VfhP2eM3OPKYeypcR3LEO6zZ8xn2vw==} + /web3-net@1.10.2: + resolution: {integrity: sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-method: 1.8.0 - web3-utils: 1.8.0 + web3-core: 1.10.2 + web3-core-method: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-providers-http@1.8.0: - resolution: {integrity: sha512-/MqxwRzExohBWW97mqlCSW/+NHydGRyoEDUS1bAIF2YjfKFwyRtHgrEzOojzkC9JvB+8LofMvbXk9CcltpZapw==} + /web3-providers-http@1.10.2: + resolution: {integrity: sha512-G8abKtpkyKGpRVKvfjIF3I4O/epHP7mxXWN8mNMQLkQj1cjMFiZBZ13f+qI77lNJN7QOf6+LtNdKrhsTGU72TA==} engines: {node: '>=8.0.0'} dependencies: - abortcontroller-polyfill: 1.7.3 - cross-fetch: 3.1.8 + abortcontroller-polyfill: 1.7.5 + cross-fetch: 4.0.0 es6-promise: 4.2.8 - web3-core-helpers: 1.8.0 + web3-core-helpers: 1.10.2 transitivePeerDependencies: - encoding + dev: false - /web3-providers-ipc@1.8.0: - resolution: {integrity: sha512-tAXHtVXNUOgehaBU8pzAlB3qhjn/PRpjdzEjzHNFqtRRTwzSEKOJxFeEhaUA4FzHnTlbnrs8ujHWUitcp1elfg==} + /web3-providers-ipc@1.10.2: + resolution: {integrity: sha512-lWbn6c+SgvhLymU8u4Ea/WOVC0Gqs7OJUvauejWz+iLycxeF0xFNyXnHVAi42ZJDPVI3vnfZotafoxcNNL7Sug==} engines: {node: '>=8.0.0'} dependencies: oboe: 2.1.5 - web3-core-helpers: 1.8.0 + web3-core-helpers: 1.10.2 + dev: false - /web3-providers-ws@1.8.0: - resolution: {integrity: sha512-bcZtSifsqyJxwkfQYamfdIRp4nhj9eJd7cxHg1uUkfLJK125WP96wyJL1xbPt7qt0MpfnTFn8/UuIqIB6nFENg==} + /web3-providers-ws@1.10.2: + resolution: {integrity: sha512-3nYSiP6grI5GvpkSoehctSywfCTodU21VY8bUtXyFHK/IVfDooNtMpd5lVIMvXVAlaxwwrCfjebokaJtKH2Iag==} engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.4 - web3-core-helpers: 1.8.0 + web3-core-helpers: 1.10.2 websocket: 1.0.34 transitivePeerDependencies: - supports-color + dev: false - /web3-shh@1.8.0: - resolution: {integrity: sha512-DNRgSa9Jf9xYFUGKSMylrf+zt3MPjhI2qF+UWX07o0y3+uf8zalDGiJOWvIS4upAsdPiKKVJ7co+Neof47OMmg==} + /web3-shh@1.10.2: + resolution: {integrity: sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-core-method: 1.8.0 - web3-core-subscriptions: 1.8.0 - web3-net: 1.8.0 + web3-core: 1.10.2 + web3-core-method: 1.10.2 + web3-core-subscriptions: 1.10.2 + web3-net: 1.10.2 transitivePeerDependencies: - encoding - supports-color dev: false - /web3-utils@1.8.0: - resolution: {integrity: sha512-7nUIl7UWpLVka2f09CMbKOSEvorvHnaugIabU4mj7zfMvm0tSByLcEu3eyV9qgS11qxxLuOkzBIwCstTflhmpQ==} + /web3-utils@1.10.2: + resolution: {integrity: sha512-TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow==} engines: {node: '>=8.0.0'} dependencies: + '@ethereumjs/util': 8.1.0 bn.js: 5.2.1 ethereum-bloom-filters: 1.0.10 - ethereumjs-util: 7.1.5 + ethereum-cryptography: 2.1.2 ethjs-unit: 0.1.6 number-to-bn: 1.7.0 randombytes: 2.1.0 utf8: 3.0.0 + dev: false - /web3@1.8.0(patch_hash=dcxxuqxbti2wcxbar42oow5yze): - resolution: {integrity: sha512-sldr9stK/SALSJTgI/8qpnDuBJNMGjVR84hJ+AcdQ+MLBGLMGsCDNubCoyO6qgk1/Y9SQ7ignegOI/7BPLoiDA==} + /web3@1.10.2: + resolution: {integrity: sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==} engines: {node: '>=8.0.0'} dependencies: - web3-bzz: 1.8.0 - web3-core: 1.8.0(patch_hash=ie6z5nhvcuo3lg2pk6xeacwpbi) - web3-eth: 1.8.0 - web3-eth-personal: 1.8.0 - web3-net: 1.8.0 - web3-shh: 1.8.0 - web3-utils: 1.8.0 + web3-bzz: 1.10.2 + web3-core: 1.10.2 + web3-eth: 1.10.2 + web3-eth-personal: 1.10.2 + web3-net: 1.10.2 + web3-shh: 1.10.2 + web3-utils: 1.10.2 transitivePeerDependencies: - bufferutil - encoding - supports-color - utf-8-validate dev: false - patched: true /webcrypto-core@1.4.0: resolution: {integrity: sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==} @@ -35990,6 +36078,7 @@ packages: yaeti: 0.0.6 transitivePeerDependencies: - supports-color + dev: false /whatwg-encoding@2.0.0: resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} @@ -36093,7 +36182,6 @@ packages: for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.0 - dev: true /which-typed-array@1.1.7: resolution: {integrity: sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==} @@ -36104,7 +36192,8 @@ packages: es-abstract: 1.20.4 foreach: 2.0.5 has-tostringtag: 1.0.0 - is-typed-array: 1.1.8 + is-typed-array: 1.1.12 + dev: false /which@1.2.4: resolution: {integrity: sha512-zDRAqDSBudazdfM9zpiI30Fu9ve47htYXcGi3ln0wfKu2a7SmrT6F3VDoYONu//48V8Vz4TdCRNPjtvyRO3yBA==} @@ -36442,6 +36531,7 @@ packages: /yaeti@0.0.6: resolution: {integrity: sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==} engines: {node: '>=0.10.32'} + dev: false /yallist@2.1.2: resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} @@ -36805,7 +36895,7 @@ time: /async-call-rpc@6.3.1: '2023-05-31T14:38:02.038Z' /autoprefixer@10.4.14: '2023-03-09T21:42:07.697Z' /babel-loader@9.1.3: '2023-07-07T14:47:26.287Z' - /bignumber.js@9.1.1: '2022-12-04T12:43:57.430Z' + /bignumber.js@9.1.2: '2023-08-28T12:15:45.587Z' /bip39@3.1.0: '2023-02-25T05:36:52.236Z' /bn.js@4.12.0: '2021-02-24T07:16:47.735Z' /boring-avatars@1.6.3: '2022-02-20T17:50:27.695Z' @@ -36938,13 +37028,14 @@ time: /vitest@0.34.3: '2023-08-25T07:30:46.281Z' /wallet.ts@1.0.1: '2020-08-18T00:18:54.467Z' /web-ext@7.6.2: '2023-04-25T09:11:52.549Z' - /web3-core-helpers@1.8.0: '2022-09-14T10:59:29.411Z' - /web3-core@1.8.0: '2022-09-14T10:59:33.813Z' - /web3-eth-abi@1.8.0: '2022-09-14T10:59:27.837Z' - /web3-eth-accounts@1.8.0: '2022-09-14T10:59:35.229Z' - /web3-eth-contract@1.8.0: '2022-09-14T10:59:39.169Z' - /web3-eth@1.8.0: '2022-09-14T10:59:42.175Z' - /web3-utils@1.8.0: '2022-09-14T10:59:26.419Z' + /web3-core-helpers@1.10.2: '2023-08-28T12:56:15.752Z' + /web3-core@1.10.2: '2023-08-28T12:56:23.232Z' + /web3-eth-abi@1.10.2: '2023-08-28T12:56:13.203Z' + /web3-eth-accounts@1.10.2: '2023-08-28T12:56:25.537Z' + /web3-eth-contract@1.10.2: '2023-08-28T12:56:25.461Z' + /web3-eth@1.10.2: '2023-08-28T12:56:29.986Z' + /web3-utils@1.10.2: '2023-08-28T12:56:10.815Z' + /web3@1.10.2: '2023-08-28T12:56:38.752Z' /webextension-polyfill@0.10.0: '2022-08-12T19:42:49.271Z' /webpack-cli@5.1.4: '2023-06-07T18:23:17.058Z' /webpack-dev-server@4.15.1: '2023-06-09T14:38:58.996Z' From c1e2ff2f861a9d183733c1a72a3424418f4fd4ad Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Tue, 19 Sep 2023 17:03:53 +0800 Subject: [PATCH 04/13] chore: patch pkgs --- package.json | 4 ++- patches/web3-core@1.10.2.patch | 13 +++++++ patches/web3@1.10.2.patch | 21 +++++++++++ pnpm-lock.yaml | 64 +++++++++++++++++++--------------- 4 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 patches/web3-core@1.10.2.patch create mode 100644 patches/web3@1.10.2.patch diff --git a/package.json b/package.json index 5ffeaa386e32..6f0e76eddcf6 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,9 @@ "@protobufjs/inquire@1.1.0": "patches/@protobufjs__inquire@1.1.0.patch", "@splinetool/runtime@0.9.342": "patches/@splinetool__runtime@0.9.342.patch", "guess-calling-code@1.1.7": "patches/guess-calling-code@1.1.7.patch", - "@walletconnect/socket-transport@1.7.8": "patches/@walletconnect__socket-transport@1.7.8.patch" + "@walletconnect/socket-transport@1.7.8": "patches/@walletconnect__socket-transport@1.7.8.patch", + "web3-core@1.10.2": "patches/web3-core@1.10.2.patch", + "web3@1.10.2": "patches/web3@1.10.2.patch" } } } diff --git a/patches/web3-core@1.10.2.patch b/patches/web3-core@1.10.2.patch new file mode 100644 index 000000000000..11ef8900eaff --- /dev/null +++ b/patches/web3-core@1.10.2.patch @@ -0,0 +1,13 @@ +diff --git a/types/index.d.ts b/types/index.d.ts +index 2853d4e2c57b6225ba38077d13325e53ded87c70..40318f892b4542dbc47ae49806ef46924607c4d2 100644 +--- a/types/index.d.ts ++++ b/types/index.d.ts +@@ -222,7 +222,7 @@ export interface TransactionReceipt { + logs: Log[]; + logsBloom: string; + events?: { +- [eventName: string]: EventLog; ++ [eventName: string]: EventLog | undefined; + }; + } + \ No newline at end of file diff --git a/patches/web3@1.10.2.patch b/patches/web3@1.10.2.patch new file mode 100644 index 000000000000..9bc0c4a01346 --- /dev/null +++ b/patches/web3@1.10.2.patch @@ -0,0 +1,21 @@ +diff --git a/package.json b/package.json +index 79973a924fae0f40df7e69bf3f7bcf74e4bc8c3b..fd301e07ff978dff7f2b8756f248b30ad52118ab 100644 +--- a/package.json ++++ b/package.json +@@ -8,7 +8,6 @@ + "node": ">=8.0.0" + }, + "main": "lib/index.js", +- "browser": "dist/web3.min.js", + "bugs": { + "url": "https://github.com/ethereum/web3.js/issues" + }, +@@ -18,7 +17,7 @@ + "API" + ], + "author": "ethereum.org", +- "types": "types/index.d.ts", ++ "types": "types/index.d.mts", + "scripts": { + "compile": "tsc -b tsconfig.json", + "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types", \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 800e401a806f..0a2ed6c8f3ef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,6 +95,12 @@ patchedDependencies: urlcat@3.1.0: hash: 5r5xyq4zgcnqugwsrx4lxq2i4e path: patches/urlcat@3.1.0.patch + web3-core@1.10.2: + hash: 7c6knffilb7dxuf3r2r5ttgbem + path: patches/web3-core@1.10.2.patch + web3@1.10.2: + hash: 6qos2fdq7vlcgtcov7f4zw4ome + path: patches/web3@1.10.2.patch importers: @@ -1115,10 +1121,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 @@ -1294,10 +1300,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 @@ -1870,10 +1876,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 @@ -2597,7 +2603,7 @@ importers: version: 4.0.0 web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -2651,7 +2657,7 @@ importers: version: 4.0.0 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -3866,7 +3872,7 @@ importers: version: 8.3.1(typescript@5.3.0-dev.20230830) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-eth-contract: specifier: 1.10.2 version: 1.10.2 @@ -3954,7 +3960,7 @@ importers: version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) packages/web3-hooks/evm: dependencies: @@ -3999,10 +4005,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -4191,10 +4197,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 @@ -4334,10 +4340,10 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) web3-core: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 @@ -14639,8 +14645,8 @@ packages: lodash: 4.17.21 ts-essentials: 7.0.2(typescript@5.3.0-dev.20230830) typechain: 8.3.1(typescript@5.3.0-dev.20230830) - web3: 1.10.2 - web3-core: 1.10.2 + web3: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-eth-contract: 1.10.2 transitivePeerDependencies: - typescript @@ -35519,7 +35525,7 @@ packages: web3-core-helpers: 1.10.2 dev: false - /web3-core@1.10.2: + /web3-core@1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem): resolution: {integrity: sha512-qTn2UmtE8tvwMRsC5pXVdHxrQ4uZ6jiLgF5DRUVtdi7dPUmX18Dp9uxKfIfhGcA011EAn8P6+X7r3pvi2YRxBw==} engines: {node: '>=8.0.0'} dependencies: @@ -35534,6 +35540,7 @@ packages: - encoding - supports-color dev: false + patched: true /web3-eth-abi@1.10.2: resolution: {integrity: sha512-pY4fQUio7W7ZRSLf+vsYkaxJqaT/jHcALZjIxy+uBQaYAJ3t6zpQqMZkJB3Dw7HUODRJ1yI0NPEFGTnkYf/17A==} @@ -35553,7 +35560,7 @@ packages: eth-lib: 0.2.8 scrypt-js: 3.0.1 uuid: 9.0.0 - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: 1.10.2 web3-core-method: 1.10.2 web3-utils: 1.10.2 @@ -35567,7 +35574,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: '@types/bn.js': 5.1.1 - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: 1.10.2 web3-core-method: 1.10.2 web3-core-promievent: 1.10.2 @@ -35585,7 +35592,7 @@ packages: dependencies: content-hash: 2.5.2 eth-ens-namehash: 2.0.8 - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: 1.10.2 web3-core-promievent: 1.10.2 web3-eth-abi: 1.10.2 @@ -35609,7 +35616,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: '@types/node': 20.5.7 - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: 1.10.2 web3-core-method: 1.10.2 web3-net: 1.10.2 @@ -35623,7 +35630,7 @@ packages: resolution: {integrity: sha512-s38rhrntyhGShmXC4R/aQtfkpcmev9c7iZwgb9CDIBFo7K8nrEJvqIOyajeZTxnDIiGzTJmrHxiKSadii5qTRg==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: 1.10.2 web3-core-method: 1.10.2 web3-core-subscriptions: 1.10.2 @@ -35644,7 +35651,7 @@ packages: resolution: {integrity: sha512-w9i1t2z7dItagfskhaCKwpp6W3ylUR88gs68u820y5f8yfK5EbPmHc6c2lD8X9ZrTnmDoeOpIRCN/RFPtZCp+g==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-method: 1.10.2 web3-utils: 1.10.2 transitivePeerDependencies: @@ -35687,7 +35694,7 @@ packages: resolution: {integrity: sha512-UP0Kc3pHv9uULFu0+LOVfPwKBSJ6B+sJ5KflF7NyBk6TvNRxlpF3hUhuaVDCjjB/dDUR6T0EQeg25FA2uzJbag==} engines: {node: '>=8.0.0'} dependencies: - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-method: 1.10.2 web3-core-subscriptions: 1.10.2 web3-net: 1.10.2 @@ -35710,12 +35717,12 @@ packages: utf8: 3.0.0 dev: false - /web3@1.10.2: + /web3@1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome): resolution: {integrity: sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==} engines: {node: '>=8.0.0'} dependencies: web3-bzz: 1.10.2 - web3-core: 1.10.2 + web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-eth: 1.10.2 web3-eth-personal: 1.10.2 web3-net: 1.10.2 @@ -35727,6 +35734,7 @@ packages: - supports-color - utf-8-validate dev: false + patched: true /webcrypto-core@1.4.0: resolution: {integrity: sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==} From 7d82c696b2221abef435a1700ad3cfc9ae47e934 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 10:40:48 +0800 Subject: [PATCH 05/13] refactor: code style --- packages/mask/entry-sdk/bridge/eth.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/mask/entry-sdk/bridge/eth.ts b/packages/mask/entry-sdk/bridge/eth.ts index e6243903bbf8..9b90069b136e 100644 --- a/packages/mask/entry-sdk/bridge/eth.ts +++ b/packages/mask/entry-sdk/bridge/eth.ts @@ -1,7 +1,11 @@ import { readonlyMethodType, type EthereumMethodType } from '@masknet/web3-shared-evm' import Services from '#services' -import type { EIP2255PermissionRequest } from '@masknet/sdk' -import { MaskEthereumProviderRpcError as E, ErrorCode as C, ErrorMessages as M } from '@masknet/sdk' +import { + type EIP2255PermissionRequest, + MaskEthereumProviderRpcError as E, + ErrorCode as C, + ErrorMessages as M, +} from '@masknet/sdk' const readonlyMethods: Record Promise> = {} as any for (const method of readonlyMethodType) { From ac1de7a1ea2c386932a07df365420d10ab903d08 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 16:04:30 +0800 Subject: [PATCH 06/13] fix: type errors --- package.json | 3 +-- .../services/wallet/services/select.ts | 2 +- .../Savings/src/protocols/AAVEProtocol.ts | 25 +++++++++++-------- packages/plugins/Savings/src/types.ts | 22 +++++++++++----- .../src/SmartPay/libs/ContractWallet.ts | 2 +- .../src/SmartPay/libs/UserTransaction.ts | 14 +++++------ .../src/Web3/EVM/apis/ConnectionAPI.ts | 2 +- .../Web3/EVM/apis/ConnectionReadonlyAPI.ts | 6 ++--- .../src/helpers/createWeb3FromProvider.ts | 2 +- .../src/helpers/createWeb3FromURL.ts | 2 +- .../evm/src/helpers/createContract.ts | 2 +- .../web3-shared/evm/src/libs/PayloadEditor.ts | 2 +- packages/web3-shared/evm/src/types/index.ts | 2 +- patches/web3@1.10.2.patch | 21 ---------------- pnpm-lock.yaml | 24 ++++++++---------- 15 files changed, 60 insertions(+), 71 deletions(-) delete mode 100644 patches/web3@1.10.2.patch diff --git a/package.json b/package.json index 6f0e76eddcf6..d1ebcd7711e8 100644 --- a/package.json +++ b/package.json @@ -153,8 +153,7 @@ "@splinetool/runtime@0.9.342": "patches/@splinetool__runtime@0.9.342.patch", "guess-calling-code@1.1.7": "patches/guess-calling-code@1.1.7.patch", "@walletconnect/socket-transport@1.7.8": "patches/@walletconnect__socket-transport@1.7.8.patch", - "web3-core@1.10.2": "patches/web3-core@1.10.2.patch", - "web3@1.10.2": "patches/web3@1.10.2.patch" + "web3-core@1.10.2": "patches/web3-core@1.10.2.patch" } } } diff --git a/packages/mask/background/services/wallet/services/select.ts b/packages/mask/background/services/wallet/services/select.ts index baf2c85d4d4c..021a044b1601 100644 --- a/packages/mask/background/services/wallet/services/select.ts +++ b/packages/mask/background/services/wallet/services/select.ts @@ -1,8 +1,8 @@ import { defer, type DeferTuple } from '@masknet/kit' import { PopupRoutes, type ECKeyIdentifier } from '@masknet/shared-base' import { ProviderType, type ChainId } from '@masknet/web3-shared-evm' -import { openPopupWindow } from '../../helper/popup-opener.js' import { Providers } from '@masknet/web3-providers' +import { openPopupWindow } from '../../helper/popup-opener.js' let deferred: DeferTuple | undefined diff --git a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts index 63ba8e7d2bd5..172cb481b337 100644 --- a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts +++ b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts @@ -1,3 +1,6 @@ +import type Web3 from 'web3' +import type { AbiItem } from 'web3-utils' +import { BigNumber } from 'bignumber.js' import AaveLendingPoolABI from '@masknet/web3-contracts/abis/AaveLendingPool.json' import AaveLendingPoolAddressProviderABI from '@masknet/web3-contracts/abis/AaveLendingPoolAddressProvider.json' import ERC20ABI from '@masknet/web3-contracts/abis/ERC20.json' @@ -13,9 +16,6 @@ import { type SchemaType, getAaveConstant, } from '@masknet/web3-shared-evm' -import { BigNumber } from 'bignumber.js' -import type Web3 from 'web3' -import type { AbiItem } from 'web3-utils' import { ProtocolType, type SavingsProtocol } from '../types.js' export class AAVEProtocol implements SavingsProtocol { @@ -41,7 +41,7 @@ export class AAVEProtocol implements SavingsProtocol { return this.pair[1] } - public async getApr(chainId: ChainId, web3: Web3) { + public async getApr(chainId: ChainId, web3: Web3.default) { try { const subgraphUrl = getAaveConstant(chainId, 'AAVE_SUBGRAPHS') if (!subgraphUrl) { @@ -92,7 +92,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async getBalance(chainId: ChainId, web3: Web3, account: string) { + public async getBalance(chainId: ChainId, web3: Web3.default, account: string) { try { const subgraphUrl = getAaveConstant(chainId, 'AAVE_SUBGRAPHS') @@ -140,7 +140,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async depositEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { + public async depositEstimate(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { try { const operation = await this.createDepositTokenOperation(account, chainId, web3, value) const gasEstimate = await operation?.estimateGas({ @@ -154,7 +154,12 @@ export class AAVEProtocol implements SavingsProtocol { } } - private async createDepositTokenOperation(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { + private async createDepositTokenOperation( + account: string, + chainId: ChainId, + web3: Web3.default, + value: BigNumber.Value, + ) { const aaveLPoolAddress = getAaveConstant(chainId, 'AAVE_LENDING_POOL_ADDRESSES_PROVIDER_CONTRACT_ADDRESS') const lPoolAddressProviderContract = createContract( web3, @@ -168,7 +173,7 @@ export class AAVEProtocol implements SavingsProtocol { return contract?.methods.deposit(this.bareToken.address, new BigNumber(value).toFixed(), account, '0') } - public async deposit(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { + public async deposit(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { const gasEstimate = await this.depositEstimate(account, chainId, web3, value) const operation = await this.createDepositTokenOperation(account, chainId, web3, value) if (!operation) { @@ -187,7 +192,7 @@ export class AAVEProtocol implements SavingsProtocol { }) } - public async withdrawEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { + public async withdrawEstimate(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { try { const lPoolAddressProviderContract = createContract( web3, @@ -209,7 +214,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async withdraw(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { + public async withdraw(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { const lPoolAddressProviderContract = createContract( web3, getAaveConstant(chainId, 'AAVE_LENDING_POOL_ADDRESSES_PROVIDER_CONTRACT_ADDRESS'), diff --git a/packages/plugins/Savings/src/types.ts b/packages/plugins/Savings/src/types.ts index 2bf841e7945e..835bc7a34b1e 100644 --- a/packages/plugins/Savings/src/types.ts +++ b/packages/plugins/Savings/src/types.ts @@ -25,11 +25,21 @@ export interface SavingsProtocol { readonly bareToken: FungibleToken readonly stakeToken: FungibleToken - getApr(chainId: ChainId, web3: Web3): Promise - getBalance(chainId: ChainId, web3: Web3, account: string): Promise + getApr(chainId: ChainId, web3: Web3.default): Promise + getBalance(chainId: ChainId, web3: Web3.default, account: string): Promise - depositEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise - deposit(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise - withdrawEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise - withdraw(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise + depositEstimate( + account: string, + chainId: ChainId, + web3: Web3.default, + value: BigNumber.Value, + ): Promise + deposit(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value): Promise + withdrawEstimate( + account: string, + chainId: ChainId, + web3: Web3.default, + value: BigNumber.Value, + ): Promise + withdraw(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value): Promise } diff --git a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts index 20f29b821694..df95592127c2 100644 --- a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts +++ b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts @@ -8,7 +8,7 @@ import WalletProxyABI from '@masknet/web3-contracts/abis/WalletProxy.json' import { WalletProxyByteCode } from '@masknet/web3-contracts/bytes/WalletProxy.mjs' export class ContractWallet { - private web3 = new Web3() + private web3 = new Web3.default() private coder = ABICoder as unknown as ABICoder.AbiCoder /** diff --git a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts index e3eac2b41dcc..968b6f30a65f 100644 --- a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts +++ b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts @@ -157,19 +157,19 @@ export class UserTransaction { return this.userOperation } - createWalletContract(web3: Web3, sender: string) { + createWalletContract(web3: Web3.default, sender: string) { const contract = createContract(web3, sender, WalletABI as AbiItem[]) if (!contract) throw new Error('Failed to create wallet contract.') return contract } - createEntryPointContract(web3: Web3) { + createEntryPointContract(web3: Web3.default) { const contract = createContract(web3, this.entryPoint, EntryPointABI as AbiItem[]) if (!contract) throw new Error('Failed to create entry point contract.') return contract } - async fillUserOperation(web3: Web3, overrides?: Required>) { + async fillUserOperation(web3: Web3.default, overrides?: Required>) { // from overrides if (overrides) { this.userOperation.nonce = overrides.nonce @@ -190,7 +190,7 @@ export class UserTransaction { if (isValidAddress(this.userOperation.sender) && typeof overrides === 'undefined' && nonce === 0) { try { const nonce_ = await this.createWalletContract(web3, sender).methods.nonce().call() - this.userOperation.nonce = toNumber(nonce_) + this.userOperation.nonce = toNumber(nonce_) as number } catch (error) { this.userOperation.nonce = 0 } @@ -273,7 +273,7 @@ export class UserTransaction { return toHex(callGas) } - async signTransaction(web3: Web3, signer: Signer | Signer): Promise { + async signTransaction(web3: Web3.default, signer: Signer | Signer): Promise { const transaction = UserTransaction.toTransaction(this.chainId, this.userOperation) if (!transaction.from || !transaction.to) throw new Error('Invalid transaction.') @@ -354,7 +354,7 @@ export class UserTransaction { return UserTransaction.fillUserOperation(chainId, { sender: formatEthereumAddress(from), - nonce: toNumber(nonce), + nonce: toNumber(nonce) as number, callGas: transaction.gas ?? DEFAULT_USER_OPERATION.callGas, callData: abiCoder.encodeFunctionCall(CALL_WALLET_TYPE, [to, value, data]), maxFeePerGas: transaction.maxFeePerGas ?? transaction.gasPrice ?? DEFAULT_USER_OPERATION.maxFeePerGas, @@ -381,7 +381,7 @@ export class UserTransaction { gas: userOperation.callGas, maxFeePerGas: userOperation.maxFeePerGas, maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas, - nonce: toNumber(userOperation.nonce ?? '0'), + nonce: toNumber(userOperation.nonce ?? '0') as number, data: parameters?.func ?? '0x', } } diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts index d53f31ad0395..9d2545d47bda 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts @@ -46,7 +46,7 @@ export class ConnectionAPI TransactionDetailed, TransactionSignature, Block, - Web3, + Web3.default, Web3Provider > { diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts index 0d53626a8f4a..1e72dad94324 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts @@ -1,6 +1,6 @@ import { first, omit } from 'lodash-es' import type Web3 from 'web3' -import { numberToHex, toHex, toNumber } from 'web3-utils' +import { numberToHex, toHex } from 'web3-utils' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' import { AddressType, @@ -84,7 +84,7 @@ export class ConnectionReadonlyAPI TransactionDetailed, TransactionSignature, Block, - Web3, + Web3.default, Web3Provider > { @@ -329,7 +329,7 @@ export class ConnectionReadonlyAPI if (actualSchema === SchemaType.ERC1155) { const contract = this.Contract.getERC1155Contract(address, options) // the owner has at least 1 token - return toNumber((await contract?.methods.balanceOf(owner, tokenId).call()) ?? 0) > 0 + return isGreaterThan((await contract?.methods.balanceOf(owner, tokenId).call()) ?? 0, 0) } // ERC721 diff --git a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts index 06b3bad14c56..fcc545bf14b5 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts @@ -2,7 +2,7 @@ import Web3 from 'web3' import type { provider as Provider } from 'web3-core' export function createWeb3FromProvider(provider: Provider) { - const web3 = new Web3(provider) + const web3 = new Web3.default(provider) web3.eth.transactionBlockTimeout = 10 * 1000 web3.eth.transactionPollingTimeout = 10 * 1000 // @ts-expect-error private or untyped API? diff --git a/packages/web3-providers/src/helpers/createWeb3FromURL.ts b/packages/web3-providers/src/helpers/createWeb3FromURL.ts index 7e1210b2cb99..2194863039da 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromURL.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromURL.ts @@ -7,4 +7,4 @@ function __create__(url: string) { return createWeb3FromProvider(createWeb3ProviderFromURL(url)) } -export const createWeb3FromURL: (url: string) => Web3 = memoize(__create__, (url) => url.toLowerCase()) +export const createWeb3FromURL: (url: string) => Web3.default = memoize(__create__, (url) => url.toLowerCase()) diff --git a/packages/web3-shared/evm/src/helpers/createContract.ts b/packages/web3-shared/evm/src/helpers/createContract.ts index feb54baa0c0d..33d5574c2359 100644 --- a/packages/web3-shared/evm/src/helpers/createContract.ts +++ b/packages/web3-shared/evm/src/helpers/createContract.ts @@ -5,7 +5,7 @@ import type { BaseContract } from '@masknet/web3-contracts/types/types.js' import { isValidAddress } from './address.js' export function createContract( - web3: Web3 | null, + web3: Web3.default | null, address: string | undefined, ABI: AbiItem[], options?: ContractOptions, diff --git a/packages/web3-shared/evm/src/libs/PayloadEditor.ts b/packages/web3-shared/evm/src/libs/PayloadEditor.ts index e918fdeedc5e..78a5fb22dcdf 100644 --- a/packages/web3-shared/evm/src/libs/PayloadEditor.ts +++ b/packages/web3-shared/evm/src/libs/PayloadEditor.ts @@ -257,5 +257,5 @@ function parseHexNumberString(hex: string | number | undefined) { } function parseHexNumber(hex: string | number | undefined) { - return typeof hex !== 'undefined' ? hexToNumber(hex) : undefined + return typeof hex !== 'undefined' ? (hexToNumber(hex) as number) : undefined } diff --git a/packages/web3-shared/evm/src/types/index.ts b/packages/web3-shared/evm/src/types/index.ts index bf66b7593ec1..b2c8152d020a 100644 --- a/packages/web3-shared/evm/src/types/index.ts +++ b/packages/web3-shared/evm/src/types/index.ts @@ -291,7 +291,7 @@ export enum ProviderType { CustomNetwork = 'CustomNetwork', } -export type Web3 = EVM_Web3 +export type Web3 = EVM_Web3.default /** * EIP-1193 compatible provider diff --git a/patches/web3@1.10.2.patch b/patches/web3@1.10.2.patch deleted file mode 100644 index 9bc0c4a01346..000000000000 --- a/patches/web3@1.10.2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/package.json b/package.json -index 79973a924fae0f40df7e69bf3f7bcf74e4bc8c3b..fd301e07ff978dff7f2b8756f248b30ad52118ab 100644 ---- a/package.json -+++ b/package.json -@@ -8,7 +8,6 @@ - "node": ">=8.0.0" - }, - "main": "lib/index.js", -- "browser": "dist/web3.min.js", - "bugs": { - "url": "https://github.com/ethereum/web3.js/issues" - }, -@@ -18,7 +17,7 @@ - "API" - ], - "author": "ethereum.org", -- "types": "types/index.d.ts", -+ "types": "types/index.d.mts", - "scripts": { - "compile": "tsc -b tsconfig.json", - "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types", \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a2ed6c8f3ef..3c13ca4f9213 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,9 +98,6 @@ patchedDependencies: web3-core@1.10.2: hash: 7c6knffilb7dxuf3r2r5ttgbem path: patches/web3-core@1.10.2.patch - web3@1.10.2: - hash: 6qos2fdq7vlcgtcov7f4zw4ome - path: patches/web3@1.10.2.patch importers: @@ -1121,7 +1118,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1300,7 +1297,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1876,7 +1873,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -2657,7 +2654,7 @@ importers: version: 4.0.0 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -3960,7 +3957,7 @@ importers: version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 packages/web3-hooks/evm: dependencies: @@ -4005,7 +4002,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4197,7 +4194,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4340,7 +4337,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -14645,7 +14642,7 @@ packages: lodash: 4.17.21 ts-essentials: 7.0.2(typescript@5.3.0-dev.20230830) typechain: 8.3.1(typescript@5.3.0-dev.20230830) - web3: 1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome) + web3: 1.10.2 web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-eth-contract: 1.10.2 transitivePeerDependencies: @@ -35717,7 +35714,7 @@ packages: utf8: 3.0.0 dev: false - /web3@1.10.2(patch_hash=6qos2fdq7vlcgtcov7f4zw4ome): + /web3@1.10.2: resolution: {integrity: sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==} engines: {node: '>=8.0.0'} dependencies: @@ -35734,7 +35731,6 @@ packages: - supports-color - utf-8-validate dev: false - patched: true /webcrypto-core@1.4.0: resolution: {integrity: sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==} From 29d590d5dfd2ebef92b130cc10226be0152be15f Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 16:50:34 +0800 Subject: [PATCH 07/13] fix: types --- package.json | 3 ++- .../services/wallet/database/types.ts | 2 +- .../AddDeriveWallet/index.tsx | 14 +++++------ .../src/extension/popups/pages/Wallet/type.ts | 2 +- .../extension/popups/pages/Wallet/utils.ts | 8 +++---- .../twitter.com/collecting/post.ts | 8 +++---- .../src/SiteAdaptor/RedPacketDialog.tsx | 4 ++-- .../src/SiteAdaptor/hooks/useClaimCallback.ts | 4 ++-- .../SiteAdaptor/hooks/useCreateCallback.tsx | 4 ++-- .../hooks/useCreateNftRedpacketCallback.ts | 8 +++---- .../hooks/useCreateNftRedpacketGas.ts | 4 ++-- .../SiteAdaptor/hooks/useDefaultCreateGas.ts | 12 +++++----- .../Savings/src/protocols/AAVEProtocol.ts | 21 +++++++--------- .../Savings/src/protocols/LDOProtocol.ts | 2 +- packages/plugins/Savings/src/types.ts | 24 ++++++------------- packages/storybook-shared/patch-webpack.cjs | 4 +++- .../src/SmartPay/libs/ContractWallet.ts | 10 ++++---- .../src/SmartPay/libs/UserTransaction.ts | 10 ++++---- .../src/Web3/EVM/apis/ConnectionAPI.ts | 4 ++-- .../Web3/EVM/apis/ConnectionReadonlyAPI.ts | 4 ++-- .../Web3/EVM/state/TransactionFormatter.ts | 7 +++--- .../EVM/state/TransactionFormatter/abi.ts | 7 +++--- .../src/helpers/createWeb3FromProvider.ts | 4 ++-- .../src/helpers/createWeb3FromURL.ts | 4 ++-- .../web3-shared/evm/src/helpers/abiCoder.ts | 4 ++-- .../evm/src/helpers/createAccount.ts | 4 ++-- .../evm/src/helpers/createContract.ts | 4 ++-- .../evm/src/helpers/signMessage.ts | 4 ++-- .../evm/src/helpers/signTransaction.ts | 4 ++-- packages/web3-shared/evm/src/types/index.ts | 4 ++-- patches/web3@1.10.2.patch | 13 ++++++++++ pnpm-lock.yaml | 24 +++++++++++-------- 32 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 patches/web3@1.10.2.patch diff --git a/package.json b/package.json index d1ebcd7711e8..6f0e76eddcf6 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,8 @@ "@splinetool/runtime@0.9.342": "patches/@splinetool__runtime@0.9.342.patch", "guess-calling-code@1.1.7": "patches/guess-calling-code@1.1.7.patch", "@walletconnect/socket-transport@1.7.8": "patches/@walletconnect__socket-transport@1.7.8.patch", - "web3-core@1.10.2": "patches/web3-core@1.10.2.patch" + "web3-core@1.10.2": "patches/web3-core@1.10.2.patch", + "web3@1.10.2": "patches/web3@1.10.2.patch" } } } diff --git a/packages/mask/background/services/wallet/database/types.ts b/packages/mask/background/services/wallet/database/types.ts index 618797b0a438..22a174abde75 100644 --- a/packages/mask/background/services/wallet/database/types.ts +++ b/packages/mask/background/services/wallet/database/types.ts @@ -1,6 +1,6 @@ +import type { JsonRpcPayload } from 'web3-core-helpers' import type { EIP2255Permission } from '@masknet/sdk' import type { LegacyWalletRecord } from '@masknet/shared-base' -import type { JsonRpcPayload } from 'web3-core-helpers' export interface RequestPayload extends JsonRpcPayload { owner?: string diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx index 41ee058064d8..39194a7b43ea 100644 --- a/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx +++ b/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx @@ -1,3 +1,10 @@ +import { first, sortBy, uniq } from 'lodash-es' +import urlcat from 'urlcat' +import { memo, useCallback, useMemo, useState } from 'react' +import { useAsyncFn } from 'react-use' +import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' +import { sha3 } from 'web3-utils' +import { useQueries, useQuery } from '@tanstack/react-query' import { delay } from '@masknet/kit' import { DeriveWalletTable } from '@masknet/shared' import { DashboardRoutes, EMPTY_LIST } from '@masknet/shared-base' @@ -15,19 +22,12 @@ import { Telemetry } from '@masknet/web3-telemetry' import { EventID, EventType } from '@masknet/web3-telemetry/types' import { Typography } from '@mui/material' import { Box } from '@mui/system' -import { useQueries, useQuery } from '@tanstack/react-query' -import { first, sortBy, uniq } from 'lodash-es' -import { memo, useCallback, useMemo, useState } from 'react' -import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' -import { useAsyncFn } from 'react-use' -import { sha3 } from 'web3-utils' import { PrimaryButton } from '../../../components/PrimaryButton/index.js' import { SecondaryButton } from '../../../components/SecondaryButton/index.js' import { SetupFrameController } from '../../../components/SetupFrame/index.js' import { useDashboardI18N } from '../../../locales/i18n_generated.js' import { ResetWalletContext } from '../context.js' import Services from '#services' -import urlcat from 'urlcat' const useStyles = makeStyles()((theme) => ({ header: { diff --git a/packages/mask/src/extension/popups/pages/Wallet/type.ts b/packages/mask/src/extension/popups/pages/Wallet/type.ts index 62b3f0fad45e..92e732590fa9 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/type.ts +++ b/packages/mask/src/extension/popups/pages/Wallet/type.ts @@ -1,6 +1,6 @@ +import type { JsonRpcPayload } from 'web3-core-helpers' import type { TransactionDescriptor, TransactionContext, GasOptionType } from '@masknet/web3-shared-base' import type { ChainId, TransactionParameter, Transaction } from '@masknet/web3-shared-evm' -import type { JsonRpcPayload } from 'web3-core-helpers' export enum ReplaceType { CANCEL = 'CANCEL', diff --git a/packages/mask/src/extension/popups/pages/Wallet/utils.ts b/packages/mask/src/extension/popups/pages/Wallet/utils.ts index da6a585960f6..561131d87b69 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/utils.ts +++ b/packages/mask/src/extension/popups/pages/Wallet/utils.ts @@ -1,3 +1,7 @@ +import { mapKeys } from 'lodash-es' +import type { BigNumber } from 'bignumber.js' +import { toHex } from 'web3-utils' +import { Interface } from '@ethersproject/abi' import { Web3 } from '@masknet/web3-providers' import ERC20_ABI from '@masknet/web3-contracts/abis/ERC20.json' import { toFixed, type RecentTransaction } from '@masknet/web3-shared-base' @@ -7,12 +11,8 @@ import { type ChainId, type Transaction as EvmTransaction, } from '@masknet/web3-shared-evm' -import { mapKeys } from 'lodash-es' -import { toHex } from 'web3-utils' import { GasSettingModal } from '../../modals/modals.js' import { ReplaceType } from './type.js' -import { Interface } from '@ethersproject/abi' -import type { BigNumber } from 'bignumber.js' const erc20InterFace = new Interface(ERC20_ABI) diff --git a/packages/mask/src/site-adaptors/twitter.com/collecting/post.ts b/packages/mask/src/site-adaptors/twitter.com/collecting/post.ts index e32fb549f6ed..8c88397faf91 100644 --- a/packages/mask/src/site-adaptors/twitter.com/collecting/post.ts +++ b/packages/mask/src/site-adaptors/twitter.com/collecting/post.ts @@ -1,7 +1,8 @@ +import { memoize, noop } from 'lodash-es' +import { keccak256 } from 'web3-utils' import { DOMProxy, IntervalWatcher, type DOMProxyEvents } from '@dimensiondev/holoflows-kit' import type { PostInfo } from '@masknet/plugin-infra/content-script' import { PostIdentifier, ProfileIdentifier } from '@masknet/shared-base' -import { parseId } from '../utils/url.js' import { FlattenTypedMessage, extractTextFromTypedMessage, @@ -13,11 +14,10 @@ import { } from '@masknet/typed-message' import type { SiteAdaptorUI } from '@masknet/types' import type { EventListener } from '@servie/events' -import { memoize, noop } from 'lodash-es' -import utils from 'web3-utils' import Services from '#services' import { creator, activatedSiteAdaptor_state } from '../../../site-adaptor-infra/index.js' import { createRefsForCreatePostContext } from '../../../site-adaptor-infra/utils/create-post-context.js' +import { parseId } from '../utils/url.js' import { untilElementAvailable } from '../../../utils/dom.js' import { getCurrentIdentifier } from '../../utils.js' import { twitterBase } from '../base.js' @@ -142,7 +142,7 @@ function registerPostCollectorInner( const tweetNode = getTweetNode(node) const parentTweetNode = isQuotedTweet(tweetNode) ? getParentTweetNode(tweetNode!) : null if (!tweetNode || shouldSkipDecrypt(node, tweetNode)) { - return `keccak256:${utils.keccak256(node.innerText)}` + return `keccak256:${keccak256(node.innerText)}` } const parentTweetId = parentTweetNode ? getPostId(parentTweetNode) : '' const tweetId = getPostId(tweetNode) diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx index 067251986431..2e9f0b0a05d6 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx +++ b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo, useState } from 'react' import { compact } from 'lodash-es' -import Web3Utils from 'web3-utils' +import { sha3 } from 'web3-utils' import { DialogContent, Tab } from '@mui/material' import { TabContext, TabPanel } from '@mui/lab' import { CrossIsolationMessages, NetworkPluginID, PluginID } from '@masknet/shared-base' @@ -110,7 +110,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { payload.password = prompt('Please enter the password of the lucky drop:', '') ?? '' } else if (payload.contract_version > 1 && payload.contract_version < 4) { // just sign out the password if it is lost. - payload.password = await Web3.signMessage('message', Web3Utils.sha3(payload.sender.message) ?? '', { + payload.password = await Web3.signMessage('message', sha3(payload.sender.message) ?? '', { account, }) payload.password = payload.password.slice(2) diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useClaimCallback.ts b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useClaimCallback.ts index 617328a5ec88..fe6e01881a68 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useClaimCallback.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useClaimCallback.ts @@ -1,5 +1,5 @@ import { useAsyncFn } from 'react-use' -import Web3Utils from 'web3-utils' +import { sha3 } from 'web3-utils' import { useChainContext } from '@masknet/web3-hooks-base' import type { HappyRedPacketV1 } from '@masknet/web3-contracts/types/HappyRedPacketV1.js' import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4.js' @@ -33,7 +33,7 @@ export function useClaimCallback( config, ) : await contractTransaction.fillAll( - (redPacketContract as HappyRedPacketV1).methods.claim(id, password, from, Web3Utils.sha3(from)!), + (redPacketContract as HappyRedPacketV1).methods.claim(id, password, from, sha3(from)!), config, ) diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateCallback.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateCallback.tsx index e614c7b07d8a..fc9ce3f76a28 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateCallback.tsx +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateCallback.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' import { useAsync, useAsyncFn } from 'react-use' -import Web3Utils from 'web3-utils' +import { sha3 } from 'web3-utils' import { omit } from 'lodash-es' import type { NetworkPluginID } from '@masknet/shared-base' import { useChainContext } from '@masknet/web3-hooks-base' @@ -83,7 +83,7 @@ export function useCreateParamsCallback( shares, isRandom, duration, - seed: Web3Utils.sha3(seed)!, + seed: sha3(seed)!, message, name, tokenType, diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketCallback.ts b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketCallback.ts index f45148cad288..2c5a0d76070b 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketCallback.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketCallback.ts @@ -1,5 +1,7 @@ import { useAsyncFn } from 'react-use' -import Web3Utils from 'web3-utils' +import type { AsyncFnReturn } from 'react-use/lib/useAsync.js' +import type { EventLog, TransactionReceipt } from 'web3-core' +import { sha3 } from 'web3-utils' import type { NetworkPluginID } from '@masknet/shared-base' import { decodeEvents, ContractTransaction, type GasConfig, isValidAddress } from '@masknet/web3-shared-evm' import { Web3 } from '@masknet/web3-providers' @@ -7,8 +9,6 @@ import { toFixed } from '@masknet/web3-shared-base' import { useChainContext } from '@masknet/web3-hooks-base' import type { NftRedPacket } from '@masknet/web3-contracts/types/NftRedPacket.js' import { useNftRedPacketContract } from './useNftRedPacketContract.js' -import type { AsyncFnReturn } from 'react-use/lib/useAsync.js' -import type { EventLog, TransactionReceipt } from 'web3-core' export function useCreateNftRedpacketCallback( duration: number, @@ -55,7 +55,7 @@ export function useCreateNftRedpacketCallback( const params: FillMethodParameters = [ publicKey, duration, - Web3Utils.sha3(Math.random().toString())!, + sha3(Math.random().toString())!, message, name, contractAddress, diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketGas.ts b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketGas.ts index e98a38b22ccf..f32cc06452ec 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketGas.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useCreateNftRedpacketGas.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { useAsync } from 'react-use' -import Web3Utils from 'web3-utils' +import { sha3 } from 'web3-utils' import type { NetworkPluginID } from '@masknet/shared-base' import type { NftRedPacket } from '@masknet/web3-contracts/types/NftRedPacket.js' import { useChainContext } from '@masknet/web3-hooks-base' @@ -26,7 +26,7 @@ export function useCreateNFTRedpacketGas( const params: FillMethodParameters = [ publicKey, 60 * 60 * 24, - Web3Utils.sha3(Math.random().toString())!, + sha3(Math.random().toString())!, message, name, contractAddress, diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useDefaultCreateGas.ts b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useDefaultCreateGas.ts index b1da5ae6c0a2..18567a140144 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useDefaultCreateGas.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useDefaultCreateGas.ts @@ -1,13 +1,13 @@ +import { useAsync } from 'react-use' +import { sha3 } from 'web3-utils' +import { omit } from 'lodash-es' import type { NetworkPluginID } from '@masknet/shared-base' +import { ZERO, toFixed } from '@masknet/web3-shared-base' import { useChainContext } from '@masknet/web3-hooks-base' +import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4.js' import { SchemaType, useTokenConstants } from '@masknet/web3-shared-evm' import { checkParams, type RedPacketSettings, type ParamsObjType, type MethodParameters } from './useCreateCallback.js' import { useRedPacketContract } from './useRedPacketContract.js' -import { useAsync } from 'react-use' -import { ZERO, toFixed } from '@masknet/web3-shared-base' -import Web3Utils from 'web3-utils' -import { omit } from 'lodash-es' -import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4.js' export function useDefaultCreateGas( redPacketSettings: RedPacketSettings | undefined, @@ -34,7 +34,7 @@ export function useDefaultCreateGas( shares, isRandom, duration, - seed: Web3Utils.sha3(seed)!, + seed: sha3(seed)!, message, name, tokenType, diff --git a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts index 172cb481b337..b240c2eaa216 100644 --- a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts +++ b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts @@ -1,4 +1,4 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import AaveLendingPoolABI from '@masknet/web3-contracts/abis/AaveLendingPool.json' @@ -41,7 +41,7 @@ export class AAVEProtocol implements SavingsProtocol { return this.pair[1] } - public async getApr(chainId: ChainId, web3: Web3.default) { + public async getApr(chainId: ChainId, web3: Web3) { try { const subgraphUrl = getAaveConstant(chainId, 'AAVE_SUBGRAPHS') if (!subgraphUrl) { @@ -92,7 +92,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async getBalance(chainId: ChainId, web3: Web3.default, account: string) { + public async getBalance(chainId: ChainId, web3: Web3, account: string) { try { const subgraphUrl = getAaveConstant(chainId, 'AAVE_SUBGRAPHS') @@ -140,7 +140,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async depositEstimate(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { + public async depositEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { try { const operation = await this.createDepositTokenOperation(account, chainId, web3, value) const gasEstimate = await operation?.estimateGas({ @@ -154,12 +154,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - private async createDepositTokenOperation( - account: string, - chainId: ChainId, - web3: Web3.default, - value: BigNumber.Value, - ) { + private async createDepositTokenOperation(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { const aaveLPoolAddress = getAaveConstant(chainId, 'AAVE_LENDING_POOL_ADDRESSES_PROVIDER_CONTRACT_ADDRESS') const lPoolAddressProviderContract = createContract( web3, @@ -173,7 +168,7 @@ export class AAVEProtocol implements SavingsProtocol { return contract?.methods.deposit(this.bareToken.address, new BigNumber(value).toFixed(), account, '0') } - public async deposit(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { + public async deposit(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { const gasEstimate = await this.depositEstimate(account, chainId, web3, value) const operation = await this.createDepositTokenOperation(account, chainId, web3, value) if (!operation) { @@ -192,7 +187,7 @@ export class AAVEProtocol implements SavingsProtocol { }) } - public async withdrawEstimate(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { + public async withdrawEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { try { const lPoolAddressProviderContract = createContract( web3, @@ -214,7 +209,7 @@ export class AAVEProtocol implements SavingsProtocol { } } - public async withdraw(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value) { + public async withdraw(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value) { const lPoolAddressProviderContract = createContract( web3, getAaveConstant(chainId, 'AAVE_LENDING_POOL_ADDRESSES_PROVIDER_CONTRACT_ADDRESS'), diff --git a/packages/plugins/Savings/src/protocols/LDOProtocol.ts b/packages/plugins/Savings/src/protocols/LDOProtocol.ts index 24d4e08cbbcc..42b7b208c517 100644 --- a/packages/plugins/Savings/src/protocols/LDOProtocol.ts +++ b/packages/plugins/Savings/src/protocols/LDOProtocol.ts @@ -1,4 +1,4 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import { diff --git a/packages/plugins/Savings/src/types.ts b/packages/plugins/Savings/src/types.ts index 835bc7a34b1e..87fe5af92a8f 100644 --- a/packages/plugins/Savings/src/types.ts +++ b/packages/plugins/Savings/src/types.ts @@ -1,4 +1,4 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import type { BigNumber } from 'bignumber.js' import type { ChainId, SchemaType } from '@masknet/web3-shared-evm' import type { FungibleToken } from '@masknet/web3-shared-base' @@ -25,21 +25,11 @@ export interface SavingsProtocol { readonly bareToken: FungibleToken readonly stakeToken: FungibleToken - getApr(chainId: ChainId, web3: Web3.default): Promise - getBalance(chainId: ChainId, web3: Web3.default, account: string): Promise + getApr(chainId: ChainId, web3: Web3): Promise + getBalance(chainId: ChainId, web3: Web3, account: string): Promise - depositEstimate( - account: string, - chainId: ChainId, - web3: Web3.default, - value: BigNumber.Value, - ): Promise - deposit(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value): Promise - withdrawEstimate( - account: string, - chainId: ChainId, - web3: Web3.default, - value: BigNumber.Value, - ): Promise - withdraw(account: string, chainId: ChainId, web3: Web3.default, value: BigNumber.Value): Promise + depositEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise + deposit(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise + withdrawEstimate(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise + withdraw(account: string, chainId: ChainId, web3: Web3, value: BigNumber.Value): Promise } diff --git a/packages/storybook-shared/patch-webpack.cjs b/packages/storybook-shared/patch-webpack.cjs index d266ea17dda5..10a764937a42 100644 --- a/packages/storybook-shared/patch-webpack.cjs +++ b/packages/storybook-shared/patch-webpack.cjs @@ -1,4 +1,5 @@ -const { ProvidePlugin, EnvironmentPlugin } = require('webpack') +const { ProvidePlugin } = require('webpack') + module.exports = async function (config) { const transpile = config.module.rules.find((x) => x.test.toString().includes('tsx')).use transpile.push({ @@ -33,6 +34,7 @@ module.exports = async function (config) { os: false, http: false, https: false, + zlib: false, } config.resolve.conditionNames = ['mask-src', '...'] diff --git a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts index df95592127c2..f3fd6d0fb17a 100644 --- a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts +++ b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts @@ -1,15 +1,13 @@ -import Web3 from 'web3' +import { Web3 } from 'web3' import type { AbiItem } from 'web3-utils' -import * as ABICoder from 'web3-eth-abi' -import { createContract, type ChainId, ZERO_ADDRESS, getSmartPayConstants } from '@masknet/web3-shared-evm' +import { createContract, type ChainId, ZERO_ADDRESS, getSmartPayConstants, abiCoder } from '@masknet/web3-shared-evm' import type { WalletProxy } from '@masknet/web3-contracts/types/WalletProxy.js' import WalletABI from '@masknet/web3-contracts/abis/Wallet.json' import WalletProxyABI from '@masknet/web3-contracts/abis/WalletProxy.json' import { WalletProxyByteCode } from '@masknet/web3-contracts/bytes/WalletProxy.mjs' export class ContractWallet { - private web3 = new Web3.default() - private coder = ABICoder as unknown as ABICoder.AbiCoder + private web3 = new Web3() /** * ContractWallet @@ -53,7 +51,7 @@ export class ContractWallet { const abi = WalletABI.find((x) => x.name === 'initialize' && x.type === 'function') if (!abi) throw new Error('Failed to load ABI.') - return this.coder.encodeFunctionCall(abi as AbiItem, [ + return abiCoder.encodeFunctionCall(abi as AbiItem, [ this.entryPoint, this.owner, PAYMENT_TOKEN_ADDRESS, diff --git a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts index 968b6f30a65f..3731082aeb92 100644 --- a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts +++ b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js' import { isUndefined, omitBy } from 'lodash-es' -import type Web3 from 'web3' +import type { Web3 } from 'web3' import { type AbiItem, hexToBytes, keccak256, padLeft, toHex, toNumber } from 'web3-utils' import type { ECKeyIdentifier } from '@masknet/shared-base' import { isGreaterThan, multipliedBy, toFixed } from '@masknet/web3-shared-base' @@ -157,19 +157,19 @@ export class UserTransaction { return this.userOperation } - createWalletContract(web3: Web3.default, sender: string) { + createWalletContract(web3: Web3, sender: string) { const contract = createContract(web3, sender, WalletABI as AbiItem[]) if (!contract) throw new Error('Failed to create wallet contract.') return contract } - createEntryPointContract(web3: Web3.default) { + createEntryPointContract(web3: Web3) { const contract = createContract(web3, this.entryPoint, EntryPointABI as AbiItem[]) if (!contract) throw new Error('Failed to create entry point contract.') return contract } - async fillUserOperation(web3: Web3.default, overrides?: Required>) { + async fillUserOperation(web3: Web3, overrides?: Required>) { // from overrides if (overrides) { this.userOperation.nonce = overrides.nonce @@ -273,7 +273,7 @@ export class UserTransaction { return toHex(callGas) } - async signTransaction(web3: Web3.default, signer: Signer | Signer): Promise { + async signTransaction(web3: Web3, signer: Signer | Signer): Promise { const transaction = UserTransaction.toTransaction(this.chainId, this.userOperation) if (!transaction.from || !transaction.to) throw new Error('Invalid transaction.') diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts index 9d2545d47bda..795e2166a5b8 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts @@ -1,4 +1,4 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import { toHex } from 'web3-utils' import { delay } from '@masknet/kit' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' @@ -46,7 +46,7 @@ export class ConnectionAPI TransactionDetailed, TransactionSignature, Block, - Web3.default, + Web3, Web3Provider > { diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts index 1e72dad94324..58135611bc95 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts @@ -1,5 +1,5 @@ import { first, omit } from 'lodash-es' -import type Web3 from 'web3' +import type { Web3 } from 'web3' import { numberToHex, toHex } from 'web3-utils' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' import { @@ -84,7 +84,7 @@ export class ConnectionReadonlyAPI TransactionDetailed, TransactionSignature, Block, - Web3.default, + Web3, Web3Provider > { diff --git a/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter.ts b/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter.ts index 590b7b946603..eb557eb32475 100644 --- a/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter.ts +++ b/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter.ts @@ -1,11 +1,10 @@ -import * as ABICoder from 'web3-eth-abi' -import type { WalletAPI } from '../../../entry-types.js' import { type TransactionContext, type TransactionDescriptor as TransactionDescriptorBase, TransactionDescriptorType, } from '@masknet/web3-shared-base' import { + abiCoder, AccountTransaction, type ChainId, isEmptyHex, @@ -15,6 +14,7 @@ import { } from '@masknet/web3-shared-evm' import { readABIs } from './TransactionFormatter/abi.js' import type { TransactionDescriptor } from './TransactionFormatter/types.js' +import type { WalletAPI } from '../../../entry-types.js' // built-in descriptors import { TransferTokenDescriptor } from './TransactionFormatter/descriptors/TransferToken.js' @@ -37,7 +37,6 @@ import { ConnectionReadonlyAPI } from '../apis/ConnectionReadonlyAPI.js' export class TransactionFormatter extends TransactionFormatterState { private Web3 = new ConnectionReadonlyAPI() - private coder = ABICoder as unknown as ABICoder.AbiCoder private descriptors: Record = { [TransactionDescriptorType.TRANSFER]: [new TransferTokenDescriptor()], [TransactionDescriptorType.INTERACTION]: [ @@ -88,7 +87,7 @@ export class TransactionFormatter extends TransactionFormatterState ({ name: x.name, - parameters: this.coder.decodeParameters(x.parameters, functionParameters ?? ''), + parameters: abiCoder.decodeParameters(x.parameters, functionParameters ?? ''), })), } } catch { diff --git a/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter/abi.ts b/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter/abi.ts index b8290ac82bb3..df665f5acd1c 100644 --- a/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter/abi.ts +++ b/packages/web3-providers/src/Web3/EVM/state/TransactionFormatter/abi.ts @@ -1,6 +1,6 @@ -import type { AbiItem } from 'web3-utils' -import * as ABICoder from 'web3-eth-abi' import { uniqBy } from 'lodash-es' +import type { AbiItem } from 'web3-utils' +import { abiCoder } from '@masknet/web3-shared-evm' import type { TransactionMethodABI } from './types.js' // built-in abis @@ -27,7 +27,6 @@ import LensFollowNFT from '@masknet/web3-contracts/abis/LensFollowNFT.json' import Airdrop from '@masknet/web3-contracts/abis/AirdropV2.json' class ABI { - private coder = ABICoder as unknown as ABICoder.AbiCoder private abis: Map = new Map() constructor() { @@ -65,7 +64,7 @@ class ABI { const { name, inputs = [] } = x if (!name) return try { - const signature = this.coder.encodeFunctionSignature(x) + const signature = abiCoder.encodeFunctionSignature(x) const all = uniqBy( [ diff --git a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts index fcc545bf14b5..8f2b26f9c06c 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts @@ -1,8 +1,8 @@ -import Web3 from 'web3' +import { Web3 } from 'web3' import type { provider as Provider } from 'web3-core' export function createWeb3FromProvider(provider: Provider) { - const web3 = new Web3.default(provider) + const web3 = new Web3(provider) web3.eth.transactionBlockTimeout = 10 * 1000 web3.eth.transactionPollingTimeout = 10 * 1000 // @ts-expect-error private or untyped API? diff --git a/packages/web3-providers/src/helpers/createWeb3FromURL.ts b/packages/web3-providers/src/helpers/createWeb3FromURL.ts index 2194863039da..04c60ceef86e 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromURL.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromURL.ts @@ -1,4 +1,4 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import { memoize } from 'lodash-es' import { createWeb3FromProvider } from './createWeb3FromProvider.js' import { createWeb3ProviderFromURL } from './createWeb3ProviderFromURL.js' @@ -7,4 +7,4 @@ function __create__(url: string) { return createWeb3FromProvider(createWeb3ProviderFromURL(url)) } -export const createWeb3FromURL: (url: string) => Web3.default = memoize(__create__, (url) => url.toLowerCase()) +export const createWeb3FromURL: (url: string) => Web3 = memoize(__create__, (url) => url.toLowerCase()) diff --git a/packages/web3-shared/evm/src/helpers/abiCoder.ts b/packages/web3-shared/evm/src/helpers/abiCoder.ts index 237da7063346..2fdde6c29b4a 100644 --- a/packages/web3-shared/evm/src/helpers/abiCoder.ts +++ b/packages/web3-shared/evm/src/helpers/abiCoder.ts @@ -1,3 +1,3 @@ -import * as ABICoder from 'web3-eth-abi' +import { AbiCoder } from 'web3-eth-abi' -export const abiCoder = ABICoder as unknown as ABICoder.AbiCoder +export const abiCoder = new AbiCoder() diff --git a/packages/web3-shared/evm/src/helpers/createAccount.ts b/packages/web3-shared/evm/src/helpers/createAccount.ts index 6f3b1ec1ef2e..3f2dce332414 100644 --- a/packages/web3-shared/evm/src/helpers/createAccount.ts +++ b/packages/web3-shared/evm/src/helpers/createAccount.ts @@ -1,6 +1,6 @@ -import Accounts from 'web3-eth-accounts' +import { Accounts } from 'web3-eth-accounts' export function createAccount() { - const accounts = new (Accounts as unknown as new () => Accounts.Accounts)() + const accounts = new Accounts() return accounts.create() } diff --git a/packages/web3-shared/evm/src/helpers/createContract.ts b/packages/web3-shared/evm/src/helpers/createContract.ts index 33d5574c2359..952a490a14dc 100644 --- a/packages/web3-shared/evm/src/helpers/createContract.ts +++ b/packages/web3-shared/evm/src/helpers/createContract.ts @@ -1,11 +1,11 @@ -import type Web3 from 'web3' +import type { Web3 } from 'web3' import type { AbiItem } from 'web3-utils' import type { ContractOptions } from 'web3-eth-contract' import type { BaseContract } from '@masknet/web3-contracts/types/types.js' import { isValidAddress } from './address.js' export function createContract( - web3: Web3.default | null, + web3: Web3 | null, address: string | undefined, ABI: AbiItem[], options?: ContractOptions, diff --git a/packages/web3-shared/evm/src/helpers/signMessage.ts b/packages/web3-shared/evm/src/helpers/signMessage.ts index d607fdeeb285..6bafa7e7c309 100644 --- a/packages/web3-shared/evm/src/helpers/signMessage.ts +++ b/packages/web3-shared/evm/src/helpers/signMessage.ts @@ -1,6 +1,6 @@ -import Accounts from 'web3-eth-accounts' +import { Accounts } from 'web3-eth-accounts' export function signMessage(message: string, privateKey: string) { - const accounts = new (Accounts as unknown as new () => Accounts.Accounts)() + const accounts = new Accounts() return accounts.sign(message, privateKey) } diff --git a/packages/web3-shared/evm/src/helpers/signTransaction.ts b/packages/web3-shared/evm/src/helpers/signTransaction.ts index e012d278a141..a0114bda134a 100644 --- a/packages/web3-shared/evm/src/helpers/signTransaction.ts +++ b/packages/web3-shared/evm/src/helpers/signTransaction.ts @@ -1,8 +1,8 @@ -import Accounts from 'web3-eth-accounts' +import { Accounts } from 'web3-eth-accounts' import type { Transaction } from '../types/index.js' export function signTransaction(transaction: Transaction, privateKey: string) { if (typeof transaction.nonce === 'undefined') throw new Error('Nonce is required.') - const accounts = new (Accounts as unknown as new () => Accounts.Accounts)() + const accounts = new Accounts() return accounts.signTransaction(transaction, privateKey) } diff --git a/packages/web3-shared/evm/src/types/index.ts b/packages/web3-shared/evm/src/types/index.ts index b2c8152d020a..896f8afdeb40 100644 --- a/packages/web3-shared/evm/src/types/index.ts +++ b/packages/web3-shared/evm/src/types/index.ts @@ -1,4 +1,4 @@ -import type EVM_Web3 from 'web3' +import type { Web3 as EVM_Web3 } from 'web3' import type { Transaction as Web3Transaction, TransactionReceipt as Web3TransactionReceipt } from 'web3-core' import type { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers' import type { NonPayableTransactionObject, PayableTransactionObject } from '@masknet/web3-contracts/types/types.js' @@ -291,7 +291,7 @@ export enum ProviderType { CustomNetwork = 'CustomNetwork', } -export type Web3 = EVM_Web3.default +export type Web3 = EVM_Web3 /** * EIP-1193 compatible provider diff --git a/patches/web3@1.10.2.patch b/patches/web3@1.10.2.patch new file mode 100644 index 000000000000..5f1d335c5230 --- /dev/null +++ b/patches/web3@1.10.2.patch @@ -0,0 +1,13 @@ +diff --git a/types/index.d.ts b/types/index.d.ts +index 555e7762aa4582fd8d8a2bc00caed01fe44aaebd..0aefe994ac72ce873d6d8456f53f884f7eae19c6 100644 +--- a/types/index.d.ts ++++ b/types/index.d.ts +@@ -26,7 +26,7 @@ import { Network } from 'web3-net'; + import { Shh } from 'web3-shh'; + import { Utils } from 'web3-utils'; + +-export default class Web3 { ++export class Web3 { + constructor(); + constructor(provider: provider); + constructor(provider: provider, net: net.Socket); \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c13ca4f9213..173565cdcfe9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,6 +98,9 @@ patchedDependencies: web3-core@1.10.2: hash: 7c6knffilb7dxuf3r2r5ttgbem path: patches/web3-core@1.10.2.patch + web3@1.10.2: + hash: 6hge6s4rqtrbmf2y6ech5ezulu + path: patches/web3@1.10.2.patch importers: @@ -1118,7 +1121,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1297,7 +1300,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1873,7 +1876,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -2654,7 +2657,7 @@ importers: version: 4.0.0 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -3957,7 +3960,7 @@ importers: version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) packages/web3-hooks/evm: dependencies: @@ -4002,7 +4005,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4194,7 +4197,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4337,7 +4340,7 @@ importers: version: 1.0.1 web3: specifier: 1.10.2 - version: 1.10.2 + version: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -14642,7 +14645,7 @@ packages: lodash: 4.17.21 ts-essentials: 7.0.2(typescript@5.3.0-dev.20230830) typechain: 8.3.1(typescript@5.3.0-dev.20230830) - web3: 1.10.2 + web3: 1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu) web3-core: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-eth-contract: 1.10.2 transitivePeerDependencies: @@ -35714,7 +35717,7 @@ packages: utf8: 3.0.0 dev: false - /web3@1.10.2: + /web3@1.10.2(patch_hash=6hge6s4rqtrbmf2y6ech5ezulu): resolution: {integrity: sha512-DAtZ3a3ruPziE80uZ3Ob0YDZxt6Vk2un/F5BcBrxO70owJ9Z1Y2+loZmbh1MoAmoLGjA/SUSHeUtid3fYmBaog==} engines: {node: '>=8.0.0'} dependencies: @@ -35731,6 +35734,7 @@ packages: - supports-color - utf-8-validate dev: false + patched: true /webcrypto-core@1.4.0: resolution: {integrity: sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==} From 70e5d0396eb1cd704b440b806e80eae7e355e238 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 17:15:21 +0800 Subject: [PATCH 08/13] chore: webpack zlib --- packages/mask/.webpack/config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index b662398d4088..cdee7a884861 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -85,6 +85,7 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise Date: Wed, 20 Sep 2023 17:25:00 +0800 Subject: [PATCH 09/13] fix: abi coder type --- packages/app/webpack.config.js | 1 + packages/mask/.webpack/config.ts | 2 +- packages/mask/package.json | 1 + .../web3-shared/evm/src/helpers/abiCoder.ts | 7 +++-- pnpm-lock.yaml | 26 +++++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/packages/app/webpack.config.js b/packages/app/webpack.config.js index f7a2d915769c..5f00d49a9a71 100644 --- a/packages/app/webpack.config.js +++ b/packages/app/webpack.config.js @@ -70,6 +70,7 @@ function Configuration(env, argv) { crypto: require.resolve('crypto-browserify'), stream: require.resolve('stream-browserify'), buffer: require.resolve('buffer'), + zlib: require.resolve('zlib-browserify'), 'text-encoding': require.resolve('@sinonjs/text-encoding'), }, }, diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index cdee7a884861..f290c1e1ee85 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -85,7 +85,7 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise=4.0.0'} @@ -20559,6 +20566,10 @@ packages: isobject: 3.0.1 dev: true + /defined@0.0.0: + resolution: {integrity: sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==} + dev: false + /delay@5.0.0: resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==} engines: {node: '>=10'} @@ -33547,6 +33558,14 @@ packages: engines: {node: '>=6'} dev: true + /tape@0.2.2: + resolution: {integrity: sha512-bfyf/0yv2FZVsf80b7oo50Lyi35sfjE7VM6206du7LtpbdQP8rbLhZy/stuS/Dcq4w6jE1Pz2zFrHtfeOKbaUA==} + dependencies: + deep-equal: 0.0.0 + defined: 0.0.0 + jsonify: 0.0.1 + dev: false + /tar@4.4.19: resolution: {integrity: sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==} engines: {node: '>=4.5'} @@ -36715,6 +36734,12 @@ packages: jszip: 3.10.1 dev: true + /zlib-browserify@0.0.3: + resolution: {integrity: sha512-KW42YGoQKq7+oU46deeWMUsrPyBruEWV1DoObBTMfEC2LnTqQIrwKVKrPoz2mn5DXESW4Ca/lIP2MqGHrt/WFA==} + dependencies: + tape: 0.2.2 + dev: false + /zod@3.22.2: resolution: {integrity: sha512-wvWkphh5WQsJbVk1tbx1l1Ly4yg+XecD+Mq280uBGt9wa5BKSWf4Mhp6GmrkPixhMxmabYY7RbzlwVP32pbGCg==} dev: false @@ -37050,4 +37075,5 @@ time: /webpack-target-webextension@1.1.0: '2023-06-20T12:22:16.811Z' /yargs@17.7.2: '2023-04-27T19:59:02.861Z' /z-schema@6.0.1: '2023-04-13T12:31:24.670Z' + /zlib-browserify@0.0.3: '2013-10-01T15:26:02.577Z' /zod@3.22.2: '2023-08-19T00:15:29.521Z' From ee1752281fb77bad0d2e5cc7bf7eb9e57c108f75 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 19:18:18 +0800 Subject: [PATCH 10/13] fix: type error --- packages/plugins/Savings/src/protocols/AAVEProtocol.ts | 2 +- packages/plugins/Savings/src/protocols/LDOProtocol.ts | 2 +- packages/plugins/Savings/src/types.ts | 2 +- packages/web3-providers/src/SmartPay/libs/ContractWallet.ts | 2 +- packages/web3-providers/src/SmartPay/libs/UserTransaction.ts | 2 +- packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts | 2 +- .../web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts | 2 +- packages/web3-providers/src/helpers/createWeb3FromProvider.ts | 2 +- packages/web3-providers/src/helpers/createWeb3FromURL.ts | 2 +- packages/web3-shared/evm/src/helpers/createContract.ts | 2 +- packages/web3-shared/evm/src/types/index.ts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts index b240c2eaa216..7124da160484 100644 --- a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts +++ b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import AaveLendingPoolABI from '@masknet/web3-contracts/abis/AaveLendingPool.json' diff --git a/packages/plugins/Savings/src/protocols/LDOProtocol.ts b/packages/plugins/Savings/src/protocols/LDOProtocol.ts index 42b7b208c517..24d4e08cbbcc 100644 --- a/packages/plugins/Savings/src/protocols/LDOProtocol.ts +++ b/packages/plugins/Savings/src/protocols/LDOProtocol.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import { diff --git a/packages/plugins/Savings/src/types.ts b/packages/plugins/Savings/src/types.ts index 87fe5af92a8f..2bf841e7945e 100644 --- a/packages/plugins/Savings/src/types.ts +++ b/packages/plugins/Savings/src/types.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import type Web3 from 'web3' import type { BigNumber } from 'bignumber.js' import type { ChainId, SchemaType } from '@masknet/web3-shared-evm' import type { FungibleToken } from '@masknet/web3-shared-base' diff --git a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts index f3fd6d0fb17a..c1e993819635 100644 --- a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts +++ b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts @@ -1,4 +1,4 @@ -import { Web3 } from 'web3' +import Web3 from 'web3' import type { AbiItem } from 'web3-utils' import { createContract, type ChainId, ZERO_ADDRESS, getSmartPayConstants, abiCoder } from '@masknet/web3-shared-evm' import type { WalletProxy } from '@masknet/web3-contracts/types/WalletProxy.js' diff --git a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts index 3731082aeb92..849be581fb34 100644 --- a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts +++ b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js' import { isUndefined, omitBy } from 'lodash-es' -import type { Web3 } from 'web3' +import type Web3 from 'web3' import { type AbiItem, hexToBytes, keccak256, padLeft, toHex, toNumber } from 'web3-utils' import type { ECKeyIdentifier } from '@masknet/shared-base' import { isGreaterThan, multipliedBy, toFixed } from '@masknet/web3-shared-base' diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts index 795e2166a5b8..d53f31ad0395 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import type Web3 from 'web3' import { toHex } from 'web3-utils' import { delay } from '@masknet/kit' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts index 58135611bc95..bfdab9271be2 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts @@ -1,5 +1,5 @@ import { first, omit } from 'lodash-es' -import type { Web3 } from 'web3' +import type Web3 from 'web3' import { numberToHex, toHex } from 'web3-utils' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' import { diff --git a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts index 8f2b26f9c06c..06b3bad14c56 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts @@ -1,4 +1,4 @@ -import { Web3 } from 'web3' +import Web3 from 'web3' import type { provider as Provider } from 'web3-core' export function createWeb3FromProvider(provider: Provider) { diff --git a/packages/web3-providers/src/helpers/createWeb3FromURL.ts b/packages/web3-providers/src/helpers/createWeb3FromURL.ts index 04c60ceef86e..7e1210b2cb99 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromURL.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromURL.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import type Web3 from 'web3' import { memoize } from 'lodash-es' import { createWeb3FromProvider } from './createWeb3FromProvider.js' import { createWeb3ProviderFromURL } from './createWeb3ProviderFromURL.js' diff --git a/packages/web3-shared/evm/src/helpers/createContract.ts b/packages/web3-shared/evm/src/helpers/createContract.ts index 952a490a14dc..13e592378fab 100644 --- a/packages/web3-shared/evm/src/helpers/createContract.ts +++ b/packages/web3-shared/evm/src/helpers/createContract.ts @@ -1,4 +1,4 @@ -import type { Web3 } from 'web3' +import Web3 from 'web3' import type { AbiItem } from 'web3-utils' import type { ContractOptions } from 'web3-eth-contract' import type { BaseContract } from '@masknet/web3-contracts/types/types.js' diff --git a/packages/web3-shared/evm/src/types/index.ts b/packages/web3-shared/evm/src/types/index.ts index 896f8afdeb40..bf66b7593ec1 100644 --- a/packages/web3-shared/evm/src/types/index.ts +++ b/packages/web3-shared/evm/src/types/index.ts @@ -1,4 +1,4 @@ -import type { Web3 as EVM_Web3 } from 'web3' +import type EVM_Web3 from 'web3' import type { Transaction as Web3Transaction, TransactionReceipt as Web3TransactionReceipt } from 'web3-core' import type { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers' import type { NonPayableTransactionObject, PayableTransactionObject } from '@masknet/web3-contracts/types/types.js' From c2a40c14181541839d1421f2fce7ddeee6b25081 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 11:20:43 +0000 Subject: [PATCH 11/13] fix: markdownlint --- packages/web3-shared/evm/src/helpers/createContract.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-shared/evm/src/helpers/createContract.ts b/packages/web3-shared/evm/src/helpers/createContract.ts index 13e592378fab..feb54baa0c0d 100644 --- a/packages/web3-shared/evm/src/helpers/createContract.ts +++ b/packages/web3-shared/evm/src/helpers/createContract.ts @@ -1,4 +1,4 @@ -import Web3 from 'web3' +import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import type { ContractOptions } from 'web3-eth-contract' import type { BaseContract } from '@masknet/web3-contracts/types/types.js' From c9b52e7d038fd327689770573bd3cde9a1c2b27b Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 19:55:27 +0800 Subject: [PATCH 12/13] refactor: remove web3 --- .../SetupPersona/CloudBackup/PhoneForm.tsx | 9 +++--- packages/mask/package.json | 1 - packages/plugin-infra/package.json | 1 - packages/plugins/EVM/package.json | 1 - packages/plugins/Savings/package.json | 1 - .../Savings/src/protocols/AAVEProtocol.ts | 6 ++-- .../Savings/src/protocols/LDOProtocol.ts | 2 +- packages/plugins/Savings/src/types.ts | 3 +- packages/web3-hooks/base/package.json | 3 +- packages/web3-hooks/evm/package.json | 1 - packages/web3-providers/package.json | 1 - .../src/SmartPay/libs/ContractWallet.ts | 10 +++++-- .../src/SmartPay/libs/UserTransaction.ts | 2 +- .../src/Web3/EVM/apis/ConnectionAPI.ts | 2 +- .../Web3/EVM/apis/ConnectionReadonlyAPI.ts | 2 +- .../src/helpers/createWeb3FromProvider.ts | 2 +- .../src/helpers/createWeb3FromURL.ts | 2 +- packages/web3-shared/evm/package.json | 2 +- .../evm/src/helpers/createContract.ts | 2 +- packages/web3-shared/evm/src/libs/Web3.ts | 17 +++++++++++ packages/web3-shared/evm/src/libs/index.ts | 1 + packages/web3-shared/evm/src/types/index.ts | 4 +-- pnpm-lock.yaml | 28 ++----------------- 23 files changed, 47 insertions(+), 56 deletions(-) create mode 100644 packages/web3-shared/evm/src/libs/Web3.ts diff --git a/packages/mask/dashboard/pages/SetupPersona/CloudBackup/PhoneForm.tsx b/packages/mask/dashboard/pages/SetupPersona/CloudBackup/PhoneForm.tsx index 7e05ae732b89..5a8d9a3aa0f9 100644 --- a/packages/mask/dashboard/pages/SetupPersona/CloudBackup/PhoneForm.tsx +++ b/packages/mask/dashboard/pages/SetupPersona/CloudBackup/PhoneForm.tsx @@ -1,14 +1,13 @@ import { memo, useCallback } from 'react' +import { Controller } from 'react-hook-form' +import { Box, TextField } from '@mui/material' +import { PhoneNumberField } from '@masknet/shared' +import { CountdownButton, makeStyles, useCustomSnackbar } from '@masknet/theme' import { useDashboardI18N } from '../../../locales/i18n_generated.js' import { UserContext, useLanguage } from '../../../../shared-ui/index.js' import { CloudBackupFormContext } from '../../../contexts/CloudBackupFormContext.js' -import { Box, TextField } from '@mui/material' -import { Controller } from 'react-hook-form' - -import { CountdownButton, makeStyles, useCustomSnackbar } from '@masknet/theme' import { AccountType, Scenario, Locale } from '../../../type.js' import { sendCode } from '../../../utils/api.js' -import { PhoneNumberField } from '@masknet/shared' const useStyles = makeStyles()((theme) => ({ send: { diff --git a/packages/mask/package.json b/packages/mask/package.json index ee7d93ee4e9e..6ff0fddd27da 100644 --- a/packages/mask/package.json +++ b/packages/mask/package.json @@ -163,7 +163,6 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-core-helpers": "1.10.2", "web3-eth-abi": "1.10.2", diff --git a/packages/plugin-infra/package.json b/packages/plugin-infra/package.json index 9496842ffb64..4c4443be771a 100644 --- a/packages/plugin-infra/package.json +++ b/packages/plugin-infra/package.json @@ -85,7 +85,6 @@ "urlcat": "^3.1.0", "use-subscription": "^1.8.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-core-helpers": "1.10.2", "web3-utils": "1.10.2", diff --git a/packages/plugins/EVM/package.json b/packages/plugins/EVM/package.json index 139a4d3bf95d..fe0df36bc4b6 100644 --- a/packages/plugins/EVM/package.json +++ b/packages/plugins/EVM/package.json @@ -36,7 +36,6 @@ "react-use": "^17.4.0", "urlcat": "^3.1.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-core-helpers": "1.10.2", "web3-eth-abi": "1.10.2", diff --git a/packages/plugins/Savings/package.json b/packages/plugins/Savings/package.json index 2acdabd3765d..959cd0155987 100644 --- a/packages/plugins/Savings/package.json +++ b/packages/plugins/Savings/package.json @@ -28,7 +28,6 @@ "bignumber.js": "9.1.2", "react-use": "^17.4.0", "ts-results-es": "^4.0.0", - "web3": "1.10.2", "web3-utils": "1.10.2" } } diff --git a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts index 7124da160484..64c1ddfacff5 100644 --- a/packages/plugins/Savings/src/protocols/AAVEProtocol.ts +++ b/packages/plugins/Savings/src/protocols/AAVEProtocol.ts @@ -1,4 +1,3 @@ -import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import AaveLendingPoolABI from '@masknet/web3-contracts/abis/AaveLendingPool.json' @@ -10,10 +9,11 @@ import type { ERC20 } from '@masknet/web3-contracts/types/ERC20.js' import { fetchJSON } from '@masknet/web3-providers/helpers' import { ZERO, pow10, type FungibleToken } from '@masknet/web3-shared-base' import { - TransactionEventType, - createContract, + type Web3, type ChainId, type SchemaType, + TransactionEventType, + createContract, getAaveConstant, } from '@masknet/web3-shared-evm' import { ProtocolType, type SavingsProtocol } from '../types.js' diff --git a/packages/plugins/Savings/src/protocols/LDOProtocol.ts b/packages/plugins/Savings/src/protocols/LDOProtocol.ts index 24d4e08cbbcc..602ebce20dd0 100644 --- a/packages/plugins/Savings/src/protocols/LDOProtocol.ts +++ b/packages/plugins/Savings/src/protocols/LDOProtocol.ts @@ -1,8 +1,8 @@ -import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import { BigNumber } from 'bignumber.js' import { type ChainId, + type Web3, createContract, TransactionEventType, ZERO_ADDRESS, diff --git a/packages/plugins/Savings/src/types.ts b/packages/plugins/Savings/src/types.ts index 2bf841e7945e..2185a2168d28 100644 --- a/packages/plugins/Savings/src/types.ts +++ b/packages/plugins/Savings/src/types.ts @@ -1,6 +1,5 @@ -import type Web3 from 'web3' import type { BigNumber } from 'bignumber.js' -import type { ChainId, SchemaType } from '@masknet/web3-shared-evm' +import type { ChainId, SchemaType, Web3 } from '@masknet/web3-shared-evm' import type { FungibleToken } from '@masknet/web3-shared-base' export type TokenPair = [FungibleToken, FungibleToken] diff --git a/packages/web3-hooks/base/package.json b/packages/web3-hooks/base/package.json index dea7ad500fc2..783c01373232 100644 --- a/packages/web3-hooks/base/package.json +++ b/packages/web3-hooks/base/package.json @@ -28,7 +28,6 @@ "lru-cache": "^10.0.0", "react-use": "^17.4.0", "unstated-next": "^1.1.0", - "use-subscription": "^1.8.0", - "web3": "1.10.2" + "use-subscription": "^1.8.0" } } diff --git a/packages/web3-hooks/evm/package.json b/packages/web3-hooks/evm/package.json index a991c7c36534..9213f58e4047 100644 --- a/packages/web3-hooks/evm/package.json +++ b/packages/web3-hooks/evm/package.json @@ -24,7 +24,6 @@ "react-use": "^17.4.0", "unstated-next": "^1.1.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-utils": "1.10.2" } diff --git a/packages/web3-providers/package.json b/packages/web3-providers/package.json index f0a6ec30c351..39fda1876baa 100644 --- a/packages/web3-providers/package.json +++ b/packages/web3-providers/package.json @@ -91,7 +91,6 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-core-helpers": "1.10.2", "web3-eth": "1.10.2", diff --git a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts index c1e993819635..15da260d787e 100644 --- a/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts +++ b/packages/web3-providers/src/SmartPay/libs/ContractWallet.ts @@ -1,6 +1,12 @@ -import Web3 from 'web3' import type { AbiItem } from 'web3-utils' -import { createContract, type ChainId, ZERO_ADDRESS, getSmartPayConstants, abiCoder } from '@masknet/web3-shared-evm' +import { + type ChainId, + createContract, + ZERO_ADDRESS, + getSmartPayConstants, + abiCoder, + Web3, +} from '@masknet/web3-shared-evm' import type { WalletProxy } from '@masknet/web3-contracts/types/WalletProxy.js' import WalletABI from '@masknet/web3-contracts/abis/Wallet.json' import WalletProxyABI from '@masknet/web3-contracts/abis/WalletProxy.json' diff --git a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts index 849be581fb34..8b0baef77856 100644 --- a/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts +++ b/packages/web3-providers/src/SmartPay/libs/UserTransaction.ts @@ -1,6 +1,5 @@ import { BigNumber } from 'bignumber.js' import { isUndefined, omitBy } from 'lodash-es' -import type Web3 from 'web3' import { type AbiItem, hexToBytes, keccak256, padLeft, toHex, toNumber } from 'web3-utils' import type { ECKeyIdentifier } from '@masknet/shared-base' import { isGreaterThan, multipliedBy, toFixed } from '@masknet/web3-shared-base' @@ -22,6 +21,7 @@ import { type Signer, type Transaction, type UserOperation, + type Web3, abiCoder, } from '@masknet/web3-shared-evm' diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts index d53f31ad0395..69464939fe9b 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionAPI.ts @@ -1,4 +1,3 @@ -import type Web3 from 'web3' import { toHex } from 'web3-utils' import { delay } from '@masknet/kit' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' @@ -15,6 +14,7 @@ import { type ProviderType, type Signature, type UserOperation, + type Web3, EthereumMethodType, AccountTransaction, getAverageBlockDelay, diff --git a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts index bfdab9271be2..f9a62dd0f617 100644 --- a/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts +++ b/packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts @@ -1,5 +1,4 @@ import { first, omit } from 'lodash-es' -import type Web3 from 'web3' import { numberToHex, toHex } from 'web3-utils' import type { Account, ECKeyIdentifier, Proof, UpdatableWallet, Wallet } from '@masknet/shared-base' import { @@ -18,6 +17,7 @@ import { type ProviderType, type Signature, type UserOperation, + type Web3, isValidAddress, isEmptyHex, getTransactionStatusType, diff --git a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts index 06b3bad14c56..d5fdbf0ca741 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromProvider.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromProvider.ts @@ -1,5 +1,5 @@ -import Web3 from 'web3' import type { provider as Provider } from 'web3-core' +import { Web3 } from '@masknet/web3-shared-evm' export function createWeb3FromProvider(provider: Provider) { const web3 = new Web3(provider) diff --git a/packages/web3-providers/src/helpers/createWeb3FromURL.ts b/packages/web3-providers/src/helpers/createWeb3FromURL.ts index 7e1210b2cb99..62395bdbcb05 100644 --- a/packages/web3-providers/src/helpers/createWeb3FromURL.ts +++ b/packages/web3-providers/src/helpers/createWeb3FromURL.ts @@ -1,5 +1,5 @@ -import type Web3 from 'web3' import { memoize } from 'lodash-es' +import type { Web3 } from '@masknet/web3-shared-evm' import { createWeb3FromProvider } from './createWeb3FromProvider.js' import { createWeb3ProviderFromURL } from './createWeb3ProviderFromURL.js' diff --git a/packages/web3-shared/evm/package.json b/packages/web3-shared/evm/package.json index eca54b689b24..de5509a677f0 100644 --- a/packages/web3-shared/evm/package.json +++ b/packages/web3-shared/evm/package.json @@ -33,9 +33,9 @@ "use-subscription": "^1.8.0", "uuid": "^9.0.0", "wallet.ts": "^1.0.1", - "web3": "1.10.2", "web3-core": "1.10.2", "web3-core-helpers": "1.10.2", + "web3-eth": "1.10.2", "web3-eth-abi": "1.10.2", "web3-eth-accounts": "1.10.2", "web3-eth-contract": "1.10.2", diff --git a/packages/web3-shared/evm/src/helpers/createContract.ts b/packages/web3-shared/evm/src/helpers/createContract.ts index feb54baa0c0d..52022ed1c376 100644 --- a/packages/web3-shared/evm/src/helpers/createContract.ts +++ b/packages/web3-shared/evm/src/helpers/createContract.ts @@ -1,8 +1,8 @@ -import type Web3 from 'web3' import type { AbiItem } from 'web3-utils' import type { ContractOptions } from 'web3-eth-contract' import type { BaseContract } from '@masknet/web3-contracts/types/types.js' import { isValidAddress } from './address.js' +import type { Web3 } from '../libs/index.js' export function createContract( web3: Web3 | null, diff --git a/packages/web3-shared/evm/src/libs/Web3.ts b/packages/web3-shared/evm/src/libs/Web3.ts new file mode 100644 index 000000000000..2cfc8ee7f42f --- /dev/null +++ b/packages/web3-shared/evm/src/libs/Web3.ts @@ -0,0 +1,17 @@ +import { Eth } from 'web3-eth' +import type { provider as Provider } from 'web3-core' + +/** + * A Web3 class that is much simpler than the original web3js one. + */ +export class Web3 { + public eth: Eth = null! + + constructor(provider?: Provider) { + this.eth = provider ? new Eth(provider) : new Eth() + } + + public setProvider(provider: Provider) { + this.eth.setProvider(provider) + } +} diff --git a/packages/web3-shared/evm/src/libs/index.ts b/packages/web3-shared/evm/src/libs/index.ts index ba960964b416..0191b7bc38b7 100644 --- a/packages/web3-shared/evm/src/libs/index.ts +++ b/packages/web3-shared/evm/src/libs/index.ts @@ -9,3 +9,4 @@ export * from './PayloadEditor.js' export * from './ProviderURL.js' export * from './RequestID.js' export * from './Signer.js' +export * from './Web3.js' diff --git a/packages/web3-shared/evm/src/types/index.ts b/packages/web3-shared/evm/src/types/index.ts index bf66b7593ec1..a64b0c171fa4 100644 --- a/packages/web3-shared/evm/src/types/index.ts +++ b/packages/web3-shared/evm/src/types/index.ts @@ -1,8 +1,8 @@ -import type EVM_Web3 from 'web3' import type { Transaction as Web3Transaction, TransactionReceipt as Web3TransactionReceipt } from 'web3-core' import type { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers' import type { NonPayableTransactionObject, PayableTransactionObject } from '@masknet/web3-contracts/types/types.js' import type { Web3UI as Web3UIShared, Web3State as Web3StateShared, GasOptionType } from '@masknet/web3-shared-base' +import type { Web3 } from '../libs/Web3.js' export type ChainIdOptionalRecord = { [k in ChainId]?: T } @@ -291,8 +291,6 @@ export enum ProviderType { CustomNetwork = 'CustomNetwork', } -export type Web3 = EVM_Web3 - /** * EIP-1193 compatible provider */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb6b47c2ac4a..7394ef42f3ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1116,9 +1116,6 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1301,9 +1298,6 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -1877,9 +1871,6 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -2658,9 +2649,6 @@ importers: ts-results-es: specifier: ^4.0.0 version: 4.0.0 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-utils: specifier: 1.10.2 version: 1.10.2 @@ -3964,9 +3952,6 @@ importers: use-subscription: specifier: ^1.8.0 version: 1.8.0(react@0.0.0-experimental-0a360642d-20230711) - web3: - specifier: 1.10.2 - version: 1.10.2 packages/web3-hooks/evm: dependencies: @@ -4009,9 +3994,6 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4201,9 +4183,6 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) @@ -4344,15 +4323,15 @@ importers: wallet.ts: specifier: ^1.0.1 version: 1.0.1 - web3: - specifier: 1.10.2 - version: 1.10.2 web3-core: specifier: 1.10.2 version: 1.10.2(patch_hash=7c6knffilb7dxuf3r2r5ttgbem) web3-core-helpers: specifier: 1.10.2 version: 1.10.2 + web3-eth: + specifier: 1.10.2 + version: 1.10.2 web3-eth-abi: specifier: 1.10.2 version: 1.10.2 @@ -37084,7 +37063,6 @@ time: /web3-eth-contract@1.10.2: '2023-08-28T12:56:25.461Z' /web3-eth@1.10.2: '2023-08-28T12:56:29.986Z' /web3-utils@1.10.2: '2023-08-28T12:56:10.815Z' - /web3@1.10.2: '2023-08-28T12:56:38.752Z' /webextension-polyfill@0.10.0: '2022-08-12T19:42:49.271Z' /webpack-cli@5.1.4: '2023-06-07T18:23:17.058Z' /webpack-dev-server@4.15.1: '2023-06-09T14:38:58.996Z' From 21641ac4d09d90a29b2b0f9442597c65e33e2cb3 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 20 Sep 2023 20:24:50 +0800 Subject: [PATCH 13/13] fix: remove test case due to web3 required --- packages/encryption/test-setup.js | 2 +- .../tests/SmartPay/libs/ContractWallet.ts | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 packages/web3-providers/tests/SmartPay/libs/ContractWallet.ts diff --git a/packages/encryption/test-setup.js b/packages/encryption/test-setup.js index 60d506199859..07f5ff6f4609 100644 --- a/packages/encryption/test-setup.js +++ b/packages/encryption/test-setup.js @@ -1,6 +1,6 @@ +import { expect } from 'vitest' import { polyfill } from '@masknet/secp256k1-webcrypto/node' import '../shared-base/node_modules/tiny-secp256k1' -import { expect } from 'vitest' import { testSerializer } from '../test-serializer/index.js' expect.addSnapshotSerializer(testSerializer) diff --git a/packages/web3-providers/tests/SmartPay/libs/ContractWallet.ts b/packages/web3-providers/tests/SmartPay/libs/ContractWallet.ts deleted file mode 100644 index 36770349338c..000000000000 --- a/packages/web3-providers/tests/SmartPay/libs/ContractWallet.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { ChainId } from '@masknet/web3-shared-evm' -import { ContractWallet } from '../../../src/SmartPay/libs/ContractWallet.js' - -describe('ContractWallet', () => { - const wallet = new ContractWallet( - ChainId.Matic, - '0x0000000000000000000000000000000000000000', - '0x0000000000000000000000000000000000000000', - '0x0000000000000000000000000000000000000000', - ) - - test('initCode', () => { - expect(wallet.initCode).toBeTruthy() - }) -})