From 97d910a141afec369398f53bc3ebede2a6c22da1 Mon Sep 17 00:00:00 2001 From: Gergana Mihaylova Date: Wed, 31 Jan 2024 18:12:03 +0200 Subject: [PATCH 01/11] Add: demo api key to coingecko --- .env.development | 1 + .env.production | 3 ++- src/config/index.js | 1 + src/hooks/portfolio.js | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 63f0f7ece6..0f5f32afc9 100644 --- a/.env.development +++ b/.env.development @@ -20,3 +20,4 @@ TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c REACT_APP_VISUAL_ENV=dev INLINE_RUNTIME_CHUNK=false +REACT_APP_COINGECKO_API_DEMO_KEY= diff --git a/.env.production b/.env.production index f4ef397315..10a608bdf7 100644 --- a/.env.production +++ b/.env.production @@ -7,4 +7,5 @@ TRANSAK_ENV=PRODUCTION TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c TSC_COMPILE_ON_ERROR=true REACT_APP_CONSTANTS_ENDPOINT=https://jason.ambire.com -INLINE_RUNTIME_CHUNK=false \ No newline at end of file +INLINE_RUNTIME_CHUNK=false +REACT_APP_COINGECKO_API_DEMO_KEY= \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index a5be19d86e..ef2514d6a2 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -13,3 +13,4 @@ export const SUSHI_SWAP_FRAME_EXCEPTIONS = process.env.REACT_APP_SUSHI_SWAP_FRAM export const SIGNATURE_VERIFIER_DEBUGGER = (process.env.REACT_APP_SIGNATURE_VERIFIER_DEBUGGER * 1 && true) || false export const COINGECKO_API_URL = process.env.COINGECKO_API_URL || 'https://api.coingecko.com/api/v3' +export const COINGECKO_API_DEMO_KEY = process.env.REACT_APP_COINGECKO_API_DEMO_KEY \ No newline at end of file diff --git a/src/hooks/portfolio.js b/src/hooks/portfolio.js index 5d4498805d..535ee6b62c 100644 --- a/src/hooks/portfolio.js +++ b/src/hooks/portfolio.js @@ -2,7 +2,7 @@ import { usePageVisibility } from 'react-page-visibility' import usePortfolioCommon from 'ambire-common/src/hooks/usePortfolio' import { fetchGet } from 'lib/fetch' -import { ZAPPER_API_ENDPOINT, VELCRO_API_ENDPOINT, COINGECKO_API_URL } from 'config' +import { ZAPPER_API_ENDPOINT, VELCRO_API_ENDPOINT, COINGECKO_API_URL, COINGECKO_API_DEMO_KEY } from 'config' import { useToasts } from 'hooks/toasts' import useConstants from './useConstants' import useDbCacheStorage from './useCacheStorage' @@ -27,12 +27,12 @@ const getBalances = (network, address, provider, quickResponse) => { } const getCoingeckoPrices = (addresses) => - fetchGet(`${COINGECKO_API_URL}/simple/price?ids=${addresses}&vs_currencies=usd`) + fetchGet(`${COINGECKO_API_URL}/simple/price?ids=${addresses}&vs_currencies=usd&x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) const getCoingeckoPriceByContract = (id, addresses) => - fetchGet(`${COINGECKO_API_URL}/coins/${id}/contract/${addresses}`) + fetchGet(`${COINGECKO_API_URL}/coins/${id}/contract/${addresses}?x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) -const getCoingeckoCoin = (id) => fetchGet(`${COINGECKO_API_URL}/coins/${id}`) +const getCoingeckoCoin = (id) => fetchGet(`${COINGECKO_API_URL}/coins/${id}?x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) export default function usePortfolio({ currentNetwork, From 7319c03d5ee3e00c3c4a65aab530fee29dc533bb Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Tue, 6 Feb 2024 14:24:57 +0200 Subject: [PATCH 02/11] Direct revoke dapp directly to users aproovals --- src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js b/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js index 9567367405..1491a208c6 100644 --- a/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js +++ b/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js @@ -13,7 +13,10 @@ export default function GnosisSafeAppIframe({ className }) { const { chainId } = network || {} - const { url } = selectedApp || {} + let { url } = selectedApp || {} + if(url === 'https://revoke.cash/'){ + url+=`address/${selectedAcc}?chainId=${network.chainId}` + } const [loading, setLoading] = useState(true) const [hash, setHash] = useState('') const [overlayVisible, setOverlayVisible] = useState(false) From b9e2c5905c7899321afb81b200ee27b907051c77 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Tue, 6 Feb 2024 15:40:26 +0200 Subject: [PATCH 03/11] Add template functionality --- src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js b/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js index 1491a208c6..1267ddc1a5 100644 --- a/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js +++ b/src/components/Plugins/GnosisSafeApps/GnosisSafeAppIframe.js @@ -14,9 +14,7 @@ export default function GnosisSafeAppIframe({ }) { const { chainId } = network || {} let { url } = selectedApp || {} - if(url === 'https://revoke.cash/'){ - url+=`address/${selectedAcc}?chainId=${network.chainId}` - } + url = url.replace('${accountAddress}',selectedAcc).replace('${chainId}', network.chainId) const [loading, setLoading] = useState(true) const [hash, setHash] = useState('') const [overlayVisible, setOverlayVisible] = useState(false) From 74ea6cc26dd697ddb4957d62a9d41009a3c2867a Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Fri, 9 Feb 2024 18:55:01 +0200 Subject: [PATCH 04/11] Revert "Merge pull request #1538 from AmbireTech/bull-run-campaign" This reverts commit d8b8edb94fdfac912c006ec50ff0f8617b03c535, reversing changes made to a2f517b3593a7d251f44d375c7a0e3215023d110. --- package-lock.json | 595 ++++++++++++---------------- package.json | 2 +- src/lib/humanizers/UniswapV3Pool.js | 13 - 3 files changed, 251 insertions(+), 359 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ed08b8f64..6d999725d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.3", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", @@ -3011,45 +3011,6 @@ "integrity": "sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==", "deprecated": "Please use @ensdomains/ens-contracts" }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "devOptional": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "devOptional": true, - "peer": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "devOptional": true, - "peer": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, "node_modules/@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -11328,9 +11289,9 @@ } }, "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", + "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", "devOptional": true, "peer": true }, @@ -11500,20 +11461,19 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz", + "integrity": "sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==", "devOptional": true, "peer": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/type-utils": "5.46.1", + "@typescript-eslint/utils": "5.46.1", "debug": "^4.3.4", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", + "regexpp": "^3.2.0", "semver": "^7.3.7", "tsutils": "^3.21.0" }, @@ -11535,14 +11495,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -11553,9 +11513,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true, "engines": { @@ -11567,13 +11527,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -11585,22 +11545,19 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "dependencies": { @@ -11637,15 +11594,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.1.tgz", + "integrity": "sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/typescript-estree": "5.46.1", "debug": "^4.3.4" }, "engines": { @@ -11665,14 +11622,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -11683,9 +11640,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true, "engines": { @@ -11697,14 +11654,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -11725,13 +11682,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -11743,22 +11700,19 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" } }, "node_modules/@typescript-eslint/parser/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "dependencies": { @@ -11788,14 +11742,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz", + "integrity": "sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/utils": "5.46.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -11816,9 +11770,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true, "engines": { @@ -11830,14 +11784,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -11858,13 +11812,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -11876,22 +11830,19 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" } }, "node_modules/@typescript-eslint/type-utils/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "dependencies": { @@ -11957,19 +11908,19 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", + "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", "devOptional": true, "peer": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/typescript-estree": "5.46.1", "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0", "semver": "^7.3.7" }, "engines": { @@ -11984,14 +11935,14 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -12002,9 +11953,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true, "engines": { @@ -12016,14 +11967,14 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -12044,13 +11995,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -12062,22 +12013,19 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" } }, "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "dependencies": { @@ -12440,16 +12388,15 @@ "integrity": "sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==" }, "node_modules/@walletconnect/client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.8.0.tgz", - "integrity": "sha512-svyBQ14NHx6Cs2j4TpkQaBI/2AF4+LXz64FojTjMtV4VMMhl81jSO1vNeg+yYhQzvjcGH/GpSwixjyCW0xFBOQ==", - "deprecated": "WalletConnect's v1 SDKs are now deprecated. Please upgrade to a v2 SDK. For details see: https://docs.walletconnect.com/", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.7.5.tgz", + "integrity": "sha512-Vh3h1kfhmJ4Jx//H0lmmfDc5Q2s+R73Nh5cetVN41QPRrAcqHE4lR2ZS8XxRCNBl4/gcHZJIZS9J2Ui4tTXBLA==", "peer": true, "dependencies": { - "@walletconnect/core": "^1.8.0", - "@walletconnect/iso-crypto": "^1.8.0", - "@walletconnect/types": "^1.8.0", - "@walletconnect/utils": "^1.8.0" + "@walletconnect/core": "^1.7.5", + "@walletconnect/iso-crypto": "^1.7.5", + "@walletconnect/types": "^1.7.5", + "@walletconnect/utils": "^1.7.5" } }, "node_modules/@walletconnect/client/node_modules/@walletconnect/core": { @@ -12467,7 +12414,6 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-1.8.0.tgz", "integrity": "sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==", - "deprecated": "WalletConnect's v1 SDKs are now deprecated. Please upgrade to a v2 SDK. For details see: https://docs.walletconnect.com/", "peer": true }, "node_modules/@walletconnect/client/node_modules/@walletconnect/utils": { @@ -34113,13 +34059,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "devOptional": true, - "peer": true - }, "node_modules/graphql": { "version": "15.8.0", "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", @@ -46436,16 +46375,16 @@ } }, "node_modules/prettier": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz", - "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true, "peer": true, "bin": { - "prettier": "bin/prettier.cjs" + "prettier": "bin-prettier.js" }, "engines": { - "node": ">=14" + "node": ">=10.13.0" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -52593,9 +52532,9 @@ "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==" }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "peer": true, "bin": { "tsc": "bin/tsc", @@ -59375,32 +59314,6 @@ "resolved": "https://registry.npmjs.org/@ensdomains/resolver/-/resolver-0.2.4.tgz", "integrity": "sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==" }, - "@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "devOptional": true, - "peer": true, - "requires": { - "eslint-visitor-keys": "^3.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "devOptional": true, - "peer": true - } - } - }, - "@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "devOptional": true, - "peer": true - }, "@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -66100,9 +66013,9 @@ } }, "@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", + "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", "devOptional": true, "peer": true }, @@ -66269,64 +66182,63 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz", + "integrity": "sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==", "devOptional": true, "peer": true, "requires": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/type-utils": "5.46.1", + "@typescript-eslint/utils": "5.46.1", "debug": "^4.3.4", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", + "regexpp": "^3.2.0", "semver": "^7.3.7", "tsutils": "^3.21.0" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" } }, "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true }, "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" } }, "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "requires": { @@ -66349,45 +66261,45 @@ } }, "@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.1.tgz", + "integrity": "sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/typescript-estree": "5.46.1", "debug": "^4.3.4" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" } }, "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true }, "@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -66396,27 +66308,27 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" } }, "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "requires": { @@ -66435,34 +66347,34 @@ } }, "@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz", + "integrity": "sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/utils": "5.46.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, "dependencies": { "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true }, "@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -66471,27 +66383,27 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" } }, "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "requires": { @@ -66530,49 +66442,49 @@ } }, "@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", + "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", "devOptional": true, "peer": true, "requires": { - "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "5.46.1", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/typescript-estree": "5.46.1", "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0", "semver": "^7.3.7" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", + "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1" } }, "@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", + "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", "devOptional": true, "peer": true }, "@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", + "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/visitor-keys": "5.46.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -66581,27 +66493,27 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "5.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", + "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", "devOptional": true, "peer": true, "requires": { - "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/types": "5.46.1", "eslint-visitor-keys": "^3.3.0" } }, "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "devOptional": true, "peer": true }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "devOptional": true, "peer": true, "requires": { @@ -66826,15 +66738,15 @@ } }, "@walletconnect/client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.8.0.tgz", - "integrity": "sha512-svyBQ14NHx6Cs2j4TpkQaBI/2AF4+LXz64FojTjMtV4VMMhl81jSO1vNeg+yYhQzvjcGH/GpSwixjyCW0xFBOQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.7.5.tgz", + "integrity": "sha512-Vh3h1kfhmJ4Jx//H0lmmfDc5Q2s+R73Nh5cetVN41QPRrAcqHE4lR2ZS8XxRCNBl4/gcHZJIZS9J2Ui4tTXBLA==", "peer": true, "requires": { - "@walletconnect/core": "^1.8.0", - "@walletconnect/iso-crypto": "^1.8.0", - "@walletconnect/types": "^1.8.0", - "@walletconnect/utils": "^1.8.0" + "@walletconnect/core": "^1.7.5", + "@walletconnect/iso-crypto": "^1.7.5", + "@walletconnect/types": "^1.7.5", + "@walletconnect/utils": "^1.7.5" }, "dependencies": { "@walletconnect/core": { @@ -67939,7 +67851,7 @@ }, "ambire-common": { "version": "git+ssh://git@github.com/AmbireTech/ambire-common.git#0221924f075d33a879f1cd6d52a982a0693c42f9", - "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.6", + "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.3", "requires": {} }, "amdefine": { @@ -83725,13 +83637,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "devOptional": true, - "peer": true - }, "graphql": { "version": "15.8.0", "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", @@ -93625,9 +93530,9 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prettier": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz", - "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true, "peer": true }, @@ -98519,9 +98424,9 @@ "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==" }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "peer": true }, "typescript-compare": { diff --git a/package.json b/package.json index 643d0fd63b..0ce9d54e63 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.3", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", diff --git a/src/lib/humanizers/UniswapV3Pool.js b/src/lib/humanizers/UniswapV3Pool.js index a4ca1ff854..4c4344cd66 100644 --- a/src/lib/humanizers/UniswapV3Pool.js +++ b/src/lib/humanizers/UniswapV3Pool.js @@ -267,19 +267,6 @@ const UniswapV3Pool = (humanizerInfo) => { ] } }, - [exchangeRouter.getSighash('cancelOrder')]: (txn, network, opts = { extended: true }) => { - const { key } = exchangeRouter.parseTransaction(txn).args - return !opts.extended - ? [`Cancel order ${key} in ${getName(txn.to)}`] - : [ - [ - 'Cancel order', - `${key}`, - 'in', - { type: 'address', address: txn.to, name: getName(humanizerInfo, txn.to) } - ] - ] - }, // DCAHub companion can be moved to mean finance and exported to be applied also here [DCAHubCompanion.getSighash('terminate')]: (txn, network, opts = { extended: true }) => { const { _hub, _positionId, _recipientUnswapped, _recipientSwapped } = From 6b7f165c356906aee2eac6c1728940b200d071a5 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Fri, 9 Feb 2024 19:33:41 +0200 Subject: [PATCH 05/11] undo reverted commit --- package-lock.json | 10 +++++----- package.json | 2 +- src/lib/humanizers/UniswapV3Pool.js | 13 +++++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d999725d7..5794a5ce1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.3", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", @@ -13598,8 +13598,8 @@ "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==" }, "node_modules/ambire-common": { - "version": "1.0.3", - "resolved": "git+ssh://git@github.com/AmbireTech/ambire-common.git#0221924f075d33a879f1cd6d52a982a0693c42f9", + "version": "1.0.6", + "resolved": "git+ssh://git@github.com/AmbireTech/ambire-common.git#75eb07760214683c074f96b35bf76057b220cb6d", "peerDependencies": { "@ambire/signature-validator": "^1.0.3", "@ensdomains/eth-ens-namehash": "^2.0.15", @@ -67850,8 +67850,8 @@ "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==" }, "ambire-common": { - "version": "git+ssh://git@github.com/AmbireTech/ambire-common.git#0221924f075d33a879f1cd6d52a982a0693c42f9", - "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.3", + "version": "git+ssh://git@github.com/AmbireTech/ambire-common.git#75eb07760214683c074f96b35bf76057b220cb6d", + "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.6", "requires": {} }, "amdefine": { diff --git a/package.json b/package.json index 0ce9d54e63..643d0fd63b 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.3", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", diff --git a/src/lib/humanizers/UniswapV3Pool.js b/src/lib/humanizers/UniswapV3Pool.js index 4c4344cd66..a4ca1ff854 100644 --- a/src/lib/humanizers/UniswapV3Pool.js +++ b/src/lib/humanizers/UniswapV3Pool.js @@ -267,6 +267,19 @@ const UniswapV3Pool = (humanizerInfo) => { ] } }, + [exchangeRouter.getSighash('cancelOrder')]: (txn, network, opts = { extended: true }) => { + const { key } = exchangeRouter.parseTransaction(txn).args + return !opts.extended + ? [`Cancel order ${key} in ${getName(txn.to)}`] + : [ + [ + 'Cancel order', + `${key}`, + 'in', + { type: 'address', address: txn.to, name: getName(humanizerInfo, txn.to) } + ] + ] + }, // DCAHub companion can be moved to mean finance and exported to be applied also here [DCAHubCompanion.getSighash('terminate')]: (txn, network, opts = { extended: true }) => { const { _hub, _positionId, _recipientUnswapped, _recipientSwapped } = From d74c1dbb5e0a77bea63be36d5d042995956f2507 Mon Sep 17 00:00:00 2001 From: Gergana Mihaylova Date: Wed, 14 Feb 2024 12:03:11 +0200 Subject: [PATCH 06/11] Remove: coingecko url and demo key --- .env.development | 1 - .env.production | 3 +-- src/config/index.js | 3 +-- src/hooks/portfolio.js | 8 ++++---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index 0f5f32afc9..63f0f7ece6 100644 --- a/.env.development +++ b/.env.development @@ -20,4 +20,3 @@ TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c REACT_APP_VISUAL_ENV=dev INLINE_RUNTIME_CHUNK=false -REACT_APP_COINGECKO_API_DEMO_KEY= diff --git a/.env.production b/.env.production index 10a608bdf7..f4ef397315 100644 --- a/.env.production +++ b/.env.production @@ -7,5 +7,4 @@ TRANSAK_ENV=PRODUCTION TRANSAK_API_KEY=85fdedd7-0077-4c6d-8499-52039c64353c TSC_COMPILE_ON_ERROR=true REACT_APP_CONSTANTS_ENDPOINT=https://jason.ambire.com -INLINE_RUNTIME_CHUNK=false -REACT_APP_COINGECKO_API_DEMO_KEY= \ No newline at end of file +INLINE_RUNTIME_CHUNK=false \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index ef2514d6a2..5c5f65d758 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -12,5 +12,4 @@ export const SUSHI_SWAP_FRAME_EXCEPTIONS = process.env.REACT_APP_SUSHI_SWAP_FRAM : {} export const SIGNATURE_VERIFIER_DEBUGGER = (process.env.REACT_APP_SIGNATURE_VERIFIER_DEBUGGER * 1 && true) || false -export const COINGECKO_API_URL = process.env.COINGECKO_API_URL || 'https://api.coingecko.com/api/v3' -export const COINGECKO_API_DEMO_KEY = process.env.REACT_APP_COINGECKO_API_DEMO_KEY \ No newline at end of file +export const COINGECKO_API_URL = process.env.COINGECKO_API_URL || 'https://cena.ambire.com/api/v3' diff --git a/src/hooks/portfolio.js b/src/hooks/portfolio.js index 535ee6b62c..5d4498805d 100644 --- a/src/hooks/portfolio.js +++ b/src/hooks/portfolio.js @@ -2,7 +2,7 @@ import { usePageVisibility } from 'react-page-visibility' import usePortfolioCommon from 'ambire-common/src/hooks/usePortfolio' import { fetchGet } from 'lib/fetch' -import { ZAPPER_API_ENDPOINT, VELCRO_API_ENDPOINT, COINGECKO_API_URL, COINGECKO_API_DEMO_KEY } from 'config' +import { ZAPPER_API_ENDPOINT, VELCRO_API_ENDPOINT, COINGECKO_API_URL } from 'config' import { useToasts } from 'hooks/toasts' import useConstants from './useConstants' import useDbCacheStorage from './useCacheStorage' @@ -27,12 +27,12 @@ const getBalances = (network, address, provider, quickResponse) => { } const getCoingeckoPrices = (addresses) => - fetchGet(`${COINGECKO_API_URL}/simple/price?ids=${addresses}&vs_currencies=usd&x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) + fetchGet(`${COINGECKO_API_URL}/simple/price?ids=${addresses}&vs_currencies=usd`) const getCoingeckoPriceByContract = (id, addresses) => - fetchGet(`${COINGECKO_API_URL}/coins/${id}/contract/${addresses}?x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) + fetchGet(`${COINGECKO_API_URL}/coins/${id}/contract/${addresses}`) -const getCoingeckoCoin = (id) => fetchGet(`${COINGECKO_API_URL}/coins/${id}?x_cg_demo_api_key=${COINGECKO_API_DEMO_KEY}`) +const getCoingeckoCoin = (id) => fetchGet(`${COINGECKO_API_URL}/coins/${id}`) export default function usePortfolio({ currentNetwork, From e9a1090eef1bbda12aa0fd555ff250ad21620376 Mon Sep 17 00:00:00 2001 From: Gergana Mihaylova Date: Wed, 14 Feb 2024 12:16:52 +0200 Subject: [PATCH 07/11] Add: ambire-common version --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5794a5ce1d..132ec98df7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.7", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", @@ -13598,8 +13598,8 @@ "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==" }, "node_modules/ambire-common": { - "version": "1.0.6", - "resolved": "git+ssh://git@github.com/AmbireTech/ambire-common.git#75eb07760214683c074f96b35bf76057b220cb6d", + "version": "1.0.7", + "resolved": "git+ssh://git@github.com/AmbireTech/ambire-common.git#db5a86cd7d5919762dbb6231f05e7aa8c151f4e1", "peerDependencies": { "@ambire/signature-validator": "^1.0.3", "@ensdomains/eth-ens-namehash": "^2.0.15", @@ -67850,8 +67850,8 @@ "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==" }, "ambire-common": { - "version": "git+ssh://git@github.com/AmbireTech/ambire-common.git#75eb07760214683c074f96b35bf76057b220cb6d", - "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.6", + "version": "git+ssh://git@github.com/AmbireTech/ambire-common.git#db5a86cd7d5919762dbb6231f05e7aa8c151f4e1", + "from": "ambire-common@github:AmbireTech/ambire-common#v1.0.7", "requires": {} }, "amdefine": { diff --git a/package.json b/package.json index 643d0fd63b..440c368678 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@web3-react/abstract-connector": "^6.0.7", "@web3-react/types": "^6.0.7", "adex-protocol-eth": "git+https://git@github.com/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2", - "ambire-common": "github:AmbireTech/ambire-common#v1.0.6", + "ambire-common": "github:AmbireTech/ambire-common#v1.0.7", "bip44-constants": "^128.0.0", "blockies-ts": "^1.0.0", "chart.js": "^3.9.1", From 07e12368323a9bfcb8f49febd4d0923d1a3654f7 Mon Sep 17 00:00:00 2001 From: Ivo Georgiev Date: Fri, 16 Feb 2024 09:41:20 +0200 Subject: [PATCH 08/11] Revert "Add warning for unknwon address for all addresses in summary" This reverts commit 47d95060d82e5de61b36e9b418666c5f5afaca3e. --- .../common/TxnPreview/TxnPreview.js | 28 ++++--------------- src/lib/humanReadableTransactions.js | 8 +++--- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/components/common/TxnPreview/TxnPreview.js b/src/components/common/TxnPreview/TxnPreview.js index 26555f2bd4..b6d7e1dbb0 100644 --- a/src/components/common/TxnPreview/TxnPreview.js +++ b/src/components/common/TxnPreview/TxnPreview.js @@ -46,9 +46,11 @@ export default function TxnPreview({ } = useConstants() const [isExpanded, setExpanded] = useState(false) const contractName = getName(humanizerInfo, txn[0]) - const isNFTApprovalForAll = - txn.length && !!txn[2] ? txn[2].slice(0, 10) === SIG_HASH_NFT_APPROVAL_FOR_ALL : null - + const isUnknown = !isFirstFailing && !mined && !isKnown(humanizerInfo, txn, account) + const isNFTApprovalForAll = (txn.length && !!txn[2]) + ? txn[2].slice(0, 10) === SIG_HASH_NFT_APPROVAL_FOR_ALL + : null + const networkDetails = networks.find(({ id }) => id === network) const extendedSummary = getTransactionSummary(humanizerInfo, tokenList, txn, network, account, { mined, @@ -56,21 +58,6 @@ export default function TxnPreview({ meta }) - const hasUnknownAddress = extendedSummary - .map((summary) => { - return summary - .map((item) => { - if (['address', 'token'].includes(item.type) && item.address) { - return !isKnown(humanizerInfo, item.address, account) - } - return false - }) - .includes(true) - }) - .includes(true) - - const isUnknown = !mined && (!isKnown(humanizerInfo, txn[0], account) || hasUnknownAddress) - useEffect(() => !!addressLabel && setKnownAddressNames(addressLabel), [addressLabel]) return ( @@ -137,10 +124,7 @@ export default function TxnPreview({ )} {isNFTApprovalForAll && (

- Warning: Be careful while approving this permission, as it will allow access to all - NFTs on the contract, including those that you may own in the future. The recipient of - this permission can transfer NFTs from your wallet without seeking your permission - until you withdraw this authorization. Proceed with caution and stay safe! + Warning: Be careful while approving this permission, as it will allow access to all NFTs on the contract, including those that you may own in the future. The recipient of this permission can transfer NFTs from your wallet without seeking your permission until you withdraw this authorization. Proceed with caution and stay safe!

)} diff --git a/src/lib/humanReadableTransactions.js b/src/lib/humanReadableTransactions.js index 542171ca6a..0cb24f38bb 100644 --- a/src/lib/humanReadableTransactions.js +++ b/src/lib/humanReadableTransactions.js @@ -76,7 +76,7 @@ export function getTransactionSummary( .filter((sig) => sig.length > 10) .find((item) => item === `${sigHash}:${to}`) - const humanizer = sigHashWithAddress + const humanizer = !!sigHashWithAddress ? humanizers({ humanizerInfo, tokenList })[sigHashWithAddress] : humanizers({ humanizerInfo, tokenList })[sigHash] @@ -193,10 +193,10 @@ export function setKnownTokens(tokens) { ) } -export function isKnown(humanizerInfo, address, from) { - address = address.toLowerCase() +export function isKnown(humanizerInfo, txn, from) { const { tokens, names } = humanizerInfo - if (address === from.toLowerCase()) return true + if (txn[0] === from) return true + const address = txn[0].toLowerCase() return !!(knownAliases[address] || names[address] || tokens[address] || knownTokens[address]) } From 69461f0024b124ff7a2d973018efffd3934c7118 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Fri, 16 Feb 2024 10:34:36 +0200 Subject: [PATCH 09/11] Revert "Revert "Add warning for unknwon address for all addresses in summary"" This reverts commit 07e12368323a9bfcb8f49febd4d0923d1a3654f7. --- .../common/TxnPreview/TxnPreview.js | 28 +++++++++++++++---- src/lib/humanReadableTransactions.js | 8 +++--- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/common/TxnPreview/TxnPreview.js b/src/components/common/TxnPreview/TxnPreview.js index b6d7e1dbb0..26555f2bd4 100644 --- a/src/components/common/TxnPreview/TxnPreview.js +++ b/src/components/common/TxnPreview/TxnPreview.js @@ -46,11 +46,9 @@ export default function TxnPreview({ } = useConstants() const [isExpanded, setExpanded] = useState(false) const contractName = getName(humanizerInfo, txn[0]) - const isUnknown = !isFirstFailing && !mined && !isKnown(humanizerInfo, txn, account) - const isNFTApprovalForAll = (txn.length && !!txn[2]) - ? txn[2].slice(0, 10) === SIG_HASH_NFT_APPROVAL_FOR_ALL - : null - + const isNFTApprovalForAll = + txn.length && !!txn[2] ? txn[2].slice(0, 10) === SIG_HASH_NFT_APPROVAL_FOR_ALL : null + const networkDetails = networks.find(({ id }) => id === network) const extendedSummary = getTransactionSummary(humanizerInfo, tokenList, txn, network, account, { mined, @@ -58,6 +56,21 @@ export default function TxnPreview({ meta }) + const hasUnknownAddress = extendedSummary + .map((summary) => { + return summary + .map((item) => { + if (['address', 'token'].includes(item.type) && item.address) { + return !isKnown(humanizerInfo, item.address, account) + } + return false + }) + .includes(true) + }) + .includes(true) + + const isUnknown = !mined && (!isKnown(humanizerInfo, txn[0], account) || hasUnknownAddress) + useEffect(() => !!addressLabel && setKnownAddressNames(addressLabel), [addressLabel]) return ( @@ -124,7 +137,10 @@ export default function TxnPreview({ )} {isNFTApprovalForAll && (

- Warning: Be careful while approving this permission, as it will allow access to all NFTs on the contract, including those that you may own in the future. The recipient of this permission can transfer NFTs from your wallet without seeking your permission until you withdraw this authorization. Proceed with caution and stay safe! + Warning: Be careful while approving this permission, as it will allow access to all + NFTs on the contract, including those that you may own in the future. The recipient of + this permission can transfer NFTs from your wallet without seeking your permission + until you withdraw this authorization. Proceed with caution and stay safe!

)} diff --git a/src/lib/humanReadableTransactions.js b/src/lib/humanReadableTransactions.js index 0cb24f38bb..542171ca6a 100644 --- a/src/lib/humanReadableTransactions.js +++ b/src/lib/humanReadableTransactions.js @@ -76,7 +76,7 @@ export function getTransactionSummary( .filter((sig) => sig.length > 10) .find((item) => item === `${sigHash}:${to}`) - const humanizer = !!sigHashWithAddress + const humanizer = sigHashWithAddress ? humanizers({ humanizerInfo, tokenList })[sigHashWithAddress] : humanizers({ humanizerInfo, tokenList })[sigHash] @@ -193,10 +193,10 @@ export function setKnownTokens(tokens) { ) } -export function isKnown(humanizerInfo, txn, from) { +export function isKnown(humanizerInfo, address, from) { + address = address.toLowerCase() const { tokens, names } = humanizerInfo - if (txn[0] === from) return true - const address = txn[0].toLowerCase() + if (address === from.toLowerCase()) return true return !!(knownAliases[address] || names[address] || tokens[address] || knownTokens[address]) } From c1f54b65a14d5ff83a22657658cb19cbc0751224 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Fri, 16 Feb 2024 10:53:41 +0200 Subject: [PATCH 10/11] Fix unknown address warning --- src/components/common/TxnPreview/TxnPreview.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/common/TxnPreview/TxnPreview.js b/src/components/common/TxnPreview/TxnPreview.js index 26555f2bd4..abfa00470a 100644 --- a/src/components/common/TxnPreview/TxnPreview.js +++ b/src/components/common/TxnPreview/TxnPreview.js @@ -58,14 +58,16 @@ export default function TxnPreview({ const hasUnknownAddress = extendedSummary .map((summary) => { - return summary - .map((item) => { - if (['address', 'token'].includes(item.type) && item.address) { - return !isKnown(humanizerInfo, item.address, account) - } - return false - }) - .includes(true) + return !Array.isArray(summary) + ? [] + : summary + .map((item) => { + if (['address', 'token'].includes(item.type) && item.address) { + return !isKnown(humanizerInfo, item.address, account) + } + return false + }) + .includes(true) }) .includes(true) From 8082b9e14c0887ae489230df87454e47469db033 Mon Sep 17 00:00:00 2001 From: Ivo Georgiev Date: Fri, 16 Feb 2024 13:39:29 +0200 Subject: [PATCH 11/11] document deploy procedure --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db1c72848e..b60a5ae0e9 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,10 @@ This is used by the WalletConnect and Gnosis Safe Apps hooks for the queue of si ## Deployment -This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) +To deploy Ambire Wallet, run the following procedure: +1. Push/merge the changes in `main` on the private repo +2. Once it's built, verify on `wallet2.ambire.com` +3. Afterwards, manually change the CNAME on the private repo `gh-pages` branch to `wallet.ambire.com` and force push to the public repo's `gh-pages` branch ### `npm run build` fails to minify @@ -506,4 +509,4 @@ Those contracts (except Ethereum-specific WALLET, xWALLET and SupplyController) ### v0.7.7 - Update humanizer with more dapps - New ambire-common version 1.0.3 -- Changed the RPCs endpoints to Ambire RPC proxy \ No newline at end of file +- Changed the RPCs endpoints to Ambire RPC proxy