From 13bf6b11b7edb8adc00b487444d5735807841d86 Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Tue, 11 Oct 2022 19:04:31 +0530 Subject: [PATCH 1/7] removed coinbase and portis wallet --- package.json | 2 - src/config/constants.ts | 3 - src/config/enums/wallets.enum.ts | 2 - src/config/wallets.ts | 18 +----- src/tests/WalletWidget.test.tsx | 2 - yarn.lock | 105 ++----------------------------- 6 files changed, 5 insertions(+), 127 deletions(-) diff --git a/package.json b/package.json index fbea869ee..b1577fafa 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,9 @@ "dependencies": { "@badger-dao/sdk": "^1.18.8", "@badger-dao/sdk-mocks": "^1.18.8", - "@coinbase/wallet-sdk": "^3.3.0", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", - "@portis/web3": "^4.0.7", "@storybook/react": "^6.5.9", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.3.0", diff --git a/src/config/constants.ts b/src/config/constants.ts index 12bab9d2d..89fd7b2c1 100644 --- a/src/config/constants.ts +++ b/src/config/constants.ts @@ -14,8 +14,6 @@ export const RPC_WALLETS: { [index: string]: boolean } = { [Wallets.WalletConnect]: true, [Wallets.WalletLink]: true, [Wallets.Trezor]: true, - [Wallets.Portis]: true, - [Wallets.CoinbaseWallet]: true, }; export enum NETWORK_IDS { @@ -41,7 +39,6 @@ export const NETWORK_IDS_TO_NAMES = { export const CONTACT_EMAIL = 'hello@badger.finance'; export const APP_NAME = 'BadgerDAO App'; -export const PORTIS_APP_ID = 'cbf7534d-170d-4903-943f-e607dc588b7f'; export const EMPTY_DATA = '0x'; export const ZERO_CURRENCY = '0.00000'; // https://semver.org/#is-v123-a-semantic-version diff --git a/src/config/enums/wallets.enum.ts b/src/config/enums/wallets.enum.ts index 0df2c0f54..5d18d935b 100644 --- a/src/config/enums/wallets.enum.ts +++ b/src/config/enums/wallets.enum.ts @@ -4,6 +4,4 @@ export enum Wallets { WalletLink = 'WalletLink', MetaMask = 'MetaMask', Trezor = 'Trezor', - CoinbaseWallet = 'Coinbase Wallet', - Portis = 'Portis', } diff --git a/src/config/wallets.ts b/src/config/wallets.ts index c94c28c4e..899550108 100644 --- a/src/config/wallets.ts +++ b/src/config/wallets.ts @@ -1,10 +1,8 @@ import { getNetworkConfig, NetworkConfig } from '@badger-dao/sdk'; -import CoinbaseWalletSDK from '@coinbase/wallet-sdk'; -import Portis from '@portis/web3'; import WalletConnectProvider from '@walletconnect/web3-provider'; import { CHAIN_DATA_LIST } from 'web3modal'; -import { NETWORK_IDS, PORTIS_APP_ID } from './constants'; +import { NETWORK_IDS } from './constants'; import { supportedNetworks } from './networks.config'; import rpc from './rpc.config'; @@ -39,19 +37,5 @@ export function getWeb3ModalProviders(config: NetworkConfig) { network, }, }, - coinbasewallet: { - package: CoinbaseWalletSDK, - options: { - appName: 'BadgerDAO', - rpc: networkRPC, - }, - }, - portis: { - package: Portis, - options: { - id: PORTIS_APP_ID, - network, - }, - }, }; } diff --git a/src/tests/WalletWidget.test.tsx b/src/tests/WalletWidget.test.tsx index fb5bfda40..3831ea15b 100644 --- a/src/tests/WalletWidget.test.tsx +++ b/src/tests/WalletWidget.test.tsx @@ -48,8 +48,6 @@ describe('WalletWidget', () => { ); fireEvent.click(screen.getByRole('button', { name: /connect/i })); expect(screen.getByText('WalletConnect')).toBeInTheDocument(); - expect(screen.getByText('Portis')).toBeInTheDocument(); - expect(screen.getByText('Coinbase')).toBeInTheDocument(); }); test('Connected address is properly displayed', async () => { diff --git a/yarn.lock b/yarn.lock index ea7fd63f6..876cfb4ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2788,16 +2788,6 @@ schema-utils "^3.0.0" source-map "^0.7.3" -"@portis/web3@^4.0.7": - version "4.0.7" - resolved "https://registry.yarnpkg.com/@portis/web3/-/web3-4.0.7.tgz#4700e79ef35c12736ade82a31dc71c045b97209d" - integrity sha512-p/mPjjspIDPGpn2LsMP8HaQlS1OwksPYgpJUbMkwty2xCpJ8CU1xZjqc5rsFDGbCJEwC0jlpVx26jVkoBSoJ3A== - dependencies: - ethereumjs-util "5.2.0" - penpal "3.0.7" - pocket-js-core "0.0.3" - web3-provider-engine "16.0.1" - "@rollup/plugin-babel@^5.2.0": version "5.3.1" resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" @@ -5559,14 +5549,6 @@ axe-core@^4.3.5: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.2.tgz#dcf7fb6dea866166c3eab33d68208afe4d5f670c" integrity sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA== -axios@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" - integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== - dependencies: - follow-redirects "1.5.10" - is-buffer "^2.0.2" - axios@^0.24.0: version "0.24.0" resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" @@ -5924,20 +5906,13 @@ bind-decorator@^1.0.11: resolved "https://registry.yarnpkg.com/bind-decorator/-/bind-decorator-1.0.11.tgz#e41bc06a1f65dd9cec476c91c5daf3978488252f" integrity sha512-yzkH0uog6Vv/vQ9+rhSKxecnqGUZHYncg7qS7voz3Q76+TAi1SGiOKk2mlOvusQnFz9Dc4BC/NMkeXu11YgjJg== -bindings@^1.2.1, bindings@^1.5.0: +bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== dependencies: file-uri-to-path "1.0.0" -bip66@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22" - integrity sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw== - dependencies: - safe-buffer "^5.0.1" - blakejs@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" @@ -6070,7 +6045,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6, browserify-aes@^1.2.0: +browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== @@ -7601,13 +7576,6 @@ debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, d dependencies: ms "2.1.2" -debug@=3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^3.0.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -8071,15 +8039,6 @@ dotenv@^8.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== -drbg.js@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" - integrity sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g== - dependencies: - browserify-aes "^1.0.6" - create-hash "^1.1.2" - create-hmac "^1.1.4" - duplexer2@~0.1.0: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -8916,19 +8875,6 @@ ethereumjs-tx@^2.1.1: ethereumjs-common "^1.5.0" ethereumjs-util "^6.0.0" -ethereumjs-util@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz#3e0c0d1741471acf1036052d048623dee54ad642" - integrity sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA== - dependencies: - bn.js "^4.11.0" - create-hash "^1.1.2" - ethjs-util "^0.1.3" - keccak "^1.0.2" - rlp "^2.0.0" - safe-buffer "^5.1.1" - secp256k1 "^3.0.1" - ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.5: version "5.2.1" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65" @@ -9489,13 +9435,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" - follow-redirects@^1.0.0, follow-redirects@^1.14.4: version "1.15.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" @@ -10778,7 +10717,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.0, is-buffer@^2.0.2: +is-buffer@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== @@ -12374,16 +12313,6 @@ just-diff@^5.0.1: resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.3.tgz#4c9c514dec5526b25ab977590e3c39a0cf271554" integrity sha512-a8p80xcpJ6sdurk5PxDKb4mav9MeKjA3zFKZpCWBIfvg8mznfnmb13MKZvlrwJ+Lhis0wM3uGAzE0ArhFHvIcg== -keccak@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80" - integrity sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw== - dependencies: - bindings "^1.2.1" - inherits "^2.0.3" - nan "^2.2.1" - safe-buffer "^5.1.0" - keccak@^3.0.0, keccak@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" @@ -13453,7 +13382,7 @@ mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1, nan@^2.14.0, nan@^2.2.1: +nan@^2.12.1: version "2.16.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== @@ -14434,11 +14363,6 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -penpal@3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/penpal/-/penpal-3.0.7.tgz#d252711ed93b30f1d867eb82342785b3a95f5f75" - integrity sha512-WSXiq5HnEvzvY05SHhaXcsviUmCvh4Ze8AiIZzvmdzaaYAAx4rx8c6Xq6+MaVDG/Nfve3VmGD8HyRP3CkPvPbQ== - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -14544,13 +14468,6 @@ pnp-webpack-plugin@1.6.4: dependencies: ts-pnp "^1.1.6" -pocket-js-core@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/pocket-js-core/-/pocket-js-core-0.0.3.tgz#1ab278b9a6a5775e2bdc3c2c2e218057774061e4" - integrity sha512-OUTEvEVutdjLT6YyldvAlSebpBueUUWg2XKxGNt5u3QqrmLpBOOBmdDnGMNJ+lEwXtko+JqgwFq+HTi4g1QDVg== - dependencies: - axios "^0.18.0" - popper.js@1.16.1-lts: version "1.16.1-lts" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" @@ -16591,20 +16508,6 @@ scrypt-js@3.0.1, scrypt-js@^3.0.0: resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312" integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA== -secp256k1@^3.0.1: - version "3.8.0" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d" - integrity sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw== - dependencies: - bindings "^1.5.0" - bip66 "^1.1.5" - bn.js "^4.11.8" - create-hash "^1.2.0" - drbg.js "^1.0.1" - elliptic "^6.5.2" - nan "^2.14.0" - safe-buffer "^5.1.2" - secp256k1@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" From 83a692a6cd0c49d385972f99bcc746be62cbc8f6 Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Sun, 9 Oct 2022 19:12:30 +0530 Subject: [PATCH 2/7] added build analyzer --- package.json | 6 ++++-- yarn.lock | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index fbea869ee..bf091daf2 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,8 @@ "requirements-check": "node check-version.js", "postinstall": "yarn requirements-check", "storybook": "start-storybook -p 6006 -s public", - "build-storybook": "build-storybook -s public" + "build-storybook": "build-storybook -s public", + "analyze": "source-map-explorer 'build/static/js/*.js'" }, "eslintConfig": { "extends": [ @@ -96,7 +97,8 @@ ] }, "devDependencies": { - "jest-fetch-mock": "^3.0.3" + "jest-fetch-mock": "^3.0.3", + "source-map-explorer": "^2.5.3" }, "jest": { "transformIgnorePatterns": [ diff --git a/yarn.lock b/yarn.lock index ea7fd63f6..d75451d4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8115,7 +8115,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^3.1.6: +ejs@^3.1.5, ejs@^3.1.6: version "3.1.8" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== @@ -8349,7 +8349,7 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@~1.0.3: +escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== @@ -14024,7 +14024,7 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.0.3: +open@^7.0.3, open@^7.3.1: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== @@ -16408,6 +16408,13 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@~2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -16964,6 +16971,24 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-explorer@^2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.3.tgz#33551b51e33b70f56d15e79083cdd4c43e583b69" + integrity sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg== + dependencies: + btoa "^1.2.1" + chalk "^4.1.0" + convert-source-map "^1.7.0" + ejs "^3.1.5" + escape-html "^1.0.3" + glob "^7.1.6" + gzip-size "^6.0.0" + lodash "^4.17.20" + open "^7.3.1" + source-map "^0.7.4" + temp "^0.9.4" + yargs "^16.2.0" + source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -17028,7 +17053,7 @@ source-map@^0.5.0, source-map@^0.5.6: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -source-map@^0.7.3: +source-map@^0.7.3, source-map@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== @@ -17708,6 +17733,14 @@ temp-dir@^2.0.0: resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== +temp@^0.9.4: + version "0.9.4" + resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620" + integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA== + dependencies: + mkdirp "^0.5.1" + rimraf "~2.6.2" + tempy@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3" From 5400451374c7592ed025750f29455fd077440025 Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Mon, 10 Oct 2022 20:04:24 +0530 Subject: [PATCH 3/7] added bundle analyzer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf091daf2..fc24a9c73 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "postinstall": "yarn requirements-check", "storybook": "start-storybook -p 6006 -s public", "build-storybook": "build-storybook -s public", - "analyze": "source-map-explorer 'build/static/js/*.js'" + "analyze": "yarn build && source-map-explorer 'build/static/js/*.js'" }, "eslintConfig": { "extends": [ From c9e81458f4ffd3112beacfc2076db633d0eb618d Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Wed, 12 Oct 2022 22:34:44 +0530 Subject: [PATCH 4/7] added notice for polygon and bsc network --- src/components-v2/common/NetworkGasWidget.tsx | 8 +++- src/components-v2/landing/NoVaults.tsx | 22 ++++++---- .../VaultListDisplay.test.tsx.snap | 42 +++++++++---------- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/components-v2/common/NetworkGasWidget.tsx b/src/components-v2/common/NetworkGasWidget.tsx index 3581b58de..ae7e625b3 100644 --- a/src/components-v2/common/NetworkGasWidget.tsx +++ b/src/components-v2/common/NetworkGasWidget.tsx @@ -30,7 +30,13 @@ const NetworkGasWidget = (): JSX.Element => { } = useContext(StoreContext); const ref = useRef(null); return ( - + { + if (e.target?.textContent?.toLowerCase() !== 'switch networks') { + closeNetworkOptions(); + } + }} + >
@@ -261,10 +260,10 @@ exports[`VaultListDisplay displays no vaults message 1`] = ` exports[`VaultListDisplay does not display deprecated vaults with no user balance 1`] = `
Badger Builder
- No vaults on - + No vaults on Ethereum .

Switch to another network to view more vaults.

From 3e2193a8d876626c3963f461c4a2895d46cad8a6 Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Fri, 14 Oct 2022 19:54:36 +0530 Subject: [PATCH 5/7] added type --- src/components-v2/common/NetworkGasWidget.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components-v2/common/NetworkGasWidget.tsx b/src/components-v2/common/NetworkGasWidget.tsx index ae7e625b3..9d76937c5 100644 --- a/src/components-v2/common/NetworkGasWidget.tsx +++ b/src/components-v2/common/NetworkGasWidget.tsx @@ -31,8 +31,8 @@ const NetworkGasWidget = (): JSX.Element => { const ref = useRef(null); return ( { - if (e.target?.textContent?.toLowerCase() !== 'switch networks') { + onClickAway={(e: React.MouseEvent) => { + if ((e.target as HTMLElement)?.textContent?.toLowerCase() !== 'switch networks') { closeNetworkOptions(); } }} From 3996e6ab047e693c0aab9c933766576deff45515 Mon Sep 17 00:00:00 2001 From: Anil Kumar Rai Date: Fri, 14 Oct 2022 22:40:01 +0530 Subject: [PATCH 6/7] hide apraxis for zero value --- .../vault-detail/charts/VaultChart.tsx | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/components-v2/vault-detail/charts/VaultChart.tsx b/src/components-v2/vault-detail/charts/VaultChart.tsx index 3c0aacfda..63e18d1fa 100644 --- a/src/components-v2/vault-detail/charts/VaultChart.tsx +++ b/src/components-v2/vault-detail/charts/VaultChart.tsx @@ -101,6 +101,7 @@ export const VaultChart = (props: Props): JSX.Element | null => { } } }); + const hasAprVal = !!chartData.reduce((d, cD) => d + cD.apr, 0); return ( @@ -147,17 +148,20 @@ export const VaultChart = (props: Props): JSX.Element | null => { style={{ fill: 'white' }} /> )} - `${v.toFixed(1)}%`} - style={{ fill: 'white' }} - /> + {hasAprVal && ( + `${v?.toFixed(1)}%`} + style={{ fill: 'white' }} + /> + )} + {valueType === ChartValueType.USD && ( { strokeWidth={2} /> )} - + {hasAprVal && ( + + )} {version === VaultVersion.v1_5 && !isInfluenceVault(vault.vaultToken) && ( Date: Wed, 19 Oct 2022 11:40:40 -0500 Subject: [PATCH 7/7] fix: update sdk version for ibbtc service --- package.json | 4 +- .../vault-detail/specs/VaultMetrics.tsx | 4 +- src/config/routes.tsx | 3 +- src/mobx/stores/RootStore.ts | 15 +-- src/mobx/stores/rebaseStore.ts | 24 +---- yarn.lock | 99 +++++-------------- 6 files changed, 36 insertions(+), 113 deletions(-) diff --git a/package.json b/package.json index a544ebb0e..a22f36812 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "node": ">=16.13.1" }, "dependencies": { - "@badger-dao/sdk": "^1.18.8", - "@badger-dao/sdk-mocks": "^1.18.8", + "@badger-dao/sdk": "^1.18.14", + "@badger-dao/sdk-mocks": "^1.18.13", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", diff --git a/src/components-v2/vault-detail/specs/VaultMetrics.tsx b/src/components-v2/vault-detail/specs/VaultMetrics.tsx index 39ca157cf..7e0ff6b21 100644 --- a/src/components-v2/vault-detail/specs/VaultMetrics.tsx +++ b/src/components-v2/vault-detail/specs/VaultMetrics.tsx @@ -6,7 +6,7 @@ import VaultApyInformation from 'components-v2/VaultApyInformation'; import { useVaultInformation } from 'hooks/useVaultInformation'; import { StoreContext } from 'mobx/stores/store-context'; import { observer } from 'mobx-react-lite'; -import React, { MouseEvent, useContext, useState } from 'react'; +import React, { MouseEvent, useState } from 'react'; import { numberWithCommas } from '../../../mobx/utils/helpers'; import VaultDepositedAssets from '../../VaultDepositedAssets'; @@ -90,8 +90,6 @@ const VaultMetrics = observer(({ vault }: Props): JSX.Element => { setShowApyInfo(false); }; const { projectedVaultBoost, vaultBoost } = useVaultInformation(vault); - const store = useContext(StoreContext); - const { vaults } = store; const isInfluence = isInfluenceVault(vault.vaultToken); const useHistoricAPY = projectedVaultBoost === null || isInfluence; diff --git a/src/config/routes.tsx b/src/config/routes.tsx index e1bbb5ae6..7d9f1bb1e 100644 --- a/src/config/routes.tsx +++ b/src/config/routes.tsx @@ -4,7 +4,7 @@ import { QueryParams, Route } from 'mobx-router'; import React from 'react'; import { VaultSortOrder } from '../mobx/model/ui/vaults-filters'; -import { RootStore } from '../mobx/stores/RootStore'; +import store, { RootStore } from '../mobx/stores/RootStore'; import { parseQueryMultipleParams } from '../mobx/utils/helpers'; const Landing = React.lazy(() => import('../pages/Landing')); @@ -53,6 +53,7 @@ const routes = { IbBTC: new Route({ path: '/ibBTC', component: withSuspense(IbBTC), + onEnter: () => store.ibBTCStore.init(), }), vaultDetail: new Route({ path: '/vault/:vaultName', diff --git a/src/mobx/stores/RootStore.ts b/src/mobx/stores/RootStore.ts index 2a5698a50..02085bc77 100644 --- a/src/mobx/stores/RootStore.ts +++ b/src/mobx/stores/RootStore.ts @@ -67,7 +67,7 @@ export class RootStore { this.chain = new NetworkStore(this); this.wallet = new WalletStore(this, config); this.prices = new PricesStore(this); - this.rebase = new RebaseStore(this); + this.rebase = new RebaseStore(); this.uiState = new UiStateStore(); this.vaults = new VaultStore(this); this.user = new UserStore(this); @@ -125,23 +125,12 @@ export class RootStore { const { signer, address } = this.sdk; if (signer && address) { - const updateActions = [this.lockedDeposits.loadLockedBalances()]; + const updateActions = [this.lockedDeposits.loadLockedBalances(), this.user.reloadBalances()]; if (this.sdk.rewards.hasBadgerTree()) { updateActions.push(this.tree.loadBadgerTree()); } - updateActions.push(this.user.reloadBalances()); - - if (network === Network.Ethereum || network === Network.Local) { - // handle per page reloads, when init route is skipped - if (this.router.currentRoute?.path === routes.IbBTC.path) { - updateActions.push(this.ibBTCStore.init()); - } - - updateActions.push(this.rebase.fetchRebaseStats()); - } - await Promise.all(updateActions); } } diff --git a/src/mobx/stores/rebaseStore.ts b/src/mobx/stores/rebaseStore.ts index f2bf7aa39..2c28b8141 100644 --- a/src/mobx/stores/rebaseStore.ts +++ b/src/mobx/stores/rebaseStore.ts @@ -1,33 +1,19 @@ -import { action, extendObservable } from 'mobx'; +import { DiggService } from '@badger-dao/sdk'; +import { extendObservable } from 'mobx'; import { RebaseInfo } from 'mobx/model/tokens/rebase-info'; -import { RootStore } from './RootStore'; - class RebaseStore { - private store: RootStore; public rebase?: RebaseInfo; - constructor(store: RootStore) { - this.store = store; - + constructor() { extendObservable(this, { rebase: this.rebase, }); - } - - fetchRebaseStats = action(async () => { - const { sdk } = this.store; - - // temporary while sdk init in root store is not utilized - await sdk.ready(); - - const { digg: diggContract } = sdk.digg; - const sharesPerFragment = await diggContract._sharesPerFragment(); this.rebase = { - sharesPerFragment, + sharesPerFragment: DiggService.DIGG_SHARES_PER_FRAGMENT, }; - }); + } } export default RebaseStore; diff --git a/yarn.lock b/yarn.lock index 54c091cac..23c650a11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1315,10 +1315,10 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@badger-dao/sdk-mocks@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@badger-dao/sdk-mocks/-/sdk-mocks-1.18.8.tgz#7ea0b7f336c065f9fd261b8abb6fedf1007180bc" - integrity sha512-PE5AWjK2Zr+BC7TmeEYQNExe+ChpLqVWPNqqtBRWM17yOGHNCKZzrRKumOKXWu6Cr90c/JEkOWoPRc7U2ozbpw== +"@badger-dao/sdk-mocks@^1.18.13": + version "1.18.13" + resolved "https://registry.yarnpkg.com/@badger-dao/sdk-mocks/-/sdk-mocks-1.18.13.tgz#0c78db2758e94a1b6a007a679397dc1c6a8e54f8" + integrity sha512-f2K9rYrxnP1XHcLwMOKmPKY0pHZHQ2e9blM9CWTFIS7G0sJi+1HPt7gUyv8jbiqozFWkZjIOEHmXfUOHt1oLvA== dependencies: "@types/jest" "27.0.2" "@typescript-eslint/eslint-plugin" "5.0.0" @@ -1339,10 +1339,10 @@ tslib "2.3.1" typescript "4.5.4" -"@badger-dao/sdk@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@badger-dao/sdk/-/sdk-1.18.8.tgz#39cbedb6dfa6350070c33522b33af635674da87c" - integrity sha512-tlvCzf369rK0gPdBVm93kD5rv8NVv/5IX7/dnnGIKEu7nyaHnCLxXPK10GpcqQyNkCwfyig+U9oYxBsW6Yt/Rg== +"@badger-dao/sdk@^1.18.14": + version "1.18.14" + resolved "https://registry.yarnpkg.com/@badger-dao/sdk/-/sdk-1.18.14.tgz#9a5a864575cf358d8497a5da7243414696f402df" + integrity sha512-tbeH+bYZAWvGBy6aBz2ctBAfEttFCDpsj8uzwpHV5QI56EsdzyCciA2DbM42y37C8BKqud06b2kXRvrR6HIK4A== dependencies: "@0xsequence/indexer" "^0.40.6" "@0xsequence/multicall" "^0.40.6" @@ -1364,28 +1364,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@coinbase/wallet-sdk@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.3.0.tgz#e77383bce1388e5367dc35f8309702e73be47503" - integrity sha512-Prmxs5eYRxe5i+kDSsny97oPG4Pa5PhLmNDx8f7UQrvlPowGy5Tg0gHOqCie6ck2shVMdW8sKJ+RCLIRZ9kIjA== - dependencies: - "@metamask/safe-event-emitter" "2.0.0" - bind-decorator "^1.0.11" - bn.js "^5.1.1" - buffer "^6.0.3" - clsx "^1.1.0" - eth-block-tracker "4.4.3" - eth-json-rpc-filters "4.2.2" - eth-rpc-errors "4.0.2" - js-sha256 "0.9.0" - json-rpc-engine "6.1.0" - keccak "^3.0.1" - preact "^10.5.9" - qs "^6.10.3" - rxjs "^6.6.3" - stream-browserify "^3.0.0" - util "^0.12.4" - "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" @@ -2458,7 +2436,7 @@ resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== -"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0": +"@metamask/safe-event-emitter@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== @@ -5901,11 +5879,6 @@ binary-extensions@^2.0.0, binary-extensions@^2.2.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bind-decorator@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/bind-decorator/-/bind-decorator-1.0.11.tgz#e41bc06a1f65dd9cec476c91c5daf3978488252f" - integrity sha512-yzkH0uog6Vv/vQ9+rhSKxecnqGUZHYncg7qS7voz3Q76+TAi1SGiOKk2mlOvusQnFz9Dc4BC/NMkeXu11YgjJg== - bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -6678,7 +6651,7 @@ clone@^2.0.0, clone@^2.1.1: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== -clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1: +clsx@^1.0.4, clsx@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== @@ -8697,7 +8670,7 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -eth-block-tracker@4.4.3, eth-block-tracker@^4.4.2: +eth-block-tracker@^4.4.2: version "4.4.3" resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626" integrity sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw== @@ -8709,7 +8682,7 @@ eth-block-tracker@4.4.3, eth-block-tracker@^4.4.2: pify "^3.0.0" safe-event-emitter "^1.0.1" -eth-json-rpc-filters@4.2.2, eth-json-rpc-filters@^4.2.1: +eth-json-rpc-filters@^4.2.1: version "4.2.2" resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d" integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw== @@ -8756,13 +8729,6 @@ eth-query@^2.1.0, eth-query@^2.1.2: json-rpc-random-id "^1.0.0" xtend "^4.0.1" -eth-rpc-errors@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7" - integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ== - dependencies: - fast-safe-stringify "^2.0.6" - eth-rpc-errors@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10" @@ -12016,11 +11982,6 @@ js-base64@^3.7.2: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.2.tgz#816d11d81a8aff241603d19ce5761e13e41d7745" integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ== -js-sha256@0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" - integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA== - js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" @@ -12109,14 +12070,6 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-rpc-engine@6.1.0, json-rpc-engine@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" - integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - eth-rpc-errors "^4.0.2" - json-rpc-engine@^5.3.0: version "5.4.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5" @@ -12125,6 +12078,14 @@ json-rpc-engine@^5.3.0: eth-rpc-errors "^3.0.0" safe-event-emitter "^1.0.1" +json-rpc-engine@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" + integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== + dependencies: + "@metamask/safe-event-emitter" "^2.0.0" + eth-rpc-errors "^4.0.2" + json-rpc-random-id@^1.0.0, json-rpc-random-id@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz#ba49d96aded1444dbb8da3d203748acbbcdec8c8" @@ -12313,7 +12274,7 @@ just-diff@^5.0.1: resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.3.tgz#4c9c514dec5526b25ab977590e3c39a0cf271554" integrity sha512-a8p80xcpJ6sdurk5PxDKb4mav9MeKjA3zFKZpCWBIfvg8mznfnmb13MKZvlrwJ+Lhis0wM3uGAzE0ArhFHvIcg== -keccak@^3.0.0, keccak@^3.0.1: +keccak@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== @@ -15087,11 +15048,6 @@ preact@10.4.1: resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431" integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q== -preact@^10.5.9: - version "10.8.2" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.8.2.tgz#b8a614f5cc8ab0cd9e63337a3d60dc80410f4ed4" - integrity sha512-AKGt0BsDSiAYzVS78jZ9qRwuorY2CoSZtf1iOC6gLb/3QyZt+fLT09aYJBjRc/BEcRc4j+j3ggERMdNE43i1LQ== - precond@0.2: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" @@ -15406,7 +15362,7 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@^6.10.0, qs@^6.10.3: +qs@^6.10.0: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ== @@ -16383,13 +16339,6 @@ rustbn.js@~0.2.0: resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA== -rxjs@^6.6.3: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -18005,7 +17954,7 @@ tslib@2.3.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.10.0, tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -18430,7 +18379,7 @@ util@^0.11.0: dependencies: inherits "2.0.3" -util@^0.12.0, util@^0.12.4: +util@^0.12.0: version "0.12.4" resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==