From 274d79dfde2f0733eb5dce0fc7ecacec7f0ebeaf Mon Sep 17 00:00:00 2001 From: Nate Wienert Date: Thu, 2 Nov 2023 11:02:09 -1000 Subject: [PATCH] chore: align uniswap deps with wallet repo (#7527) * chore: align uniswap deps with wallet repo --- package.json | 5 +++- .../__snapshots__/parseRemote.test.tsx.snap | 26 +++++++++++++++++++ .../getRoutingDiagramEntries.test.ts.snap | 4 +++ yarn.lock | 8 +++--- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 93708838bc..354157b7eb 100644 --- a/package.json +++ b/package.json @@ -166,6 +166,9 @@ "wrangler": "^3.7.0", "yarn-deduplicate": "^6.0.0" }, + "resolutions": { + "@uniswap/sdk-core": "4.0.7" + }, "dependencies": { "@apollo/client": "^3.7.2", "@coinbase/wallet-sdk": "^3.6.4", @@ -201,7 +204,7 @@ "@uniswap/permit2-sdk": "^1.2.0", "@uniswap/redux-multicall": "^1.1.8", "@uniswap/router-sdk": "^1.6.0", - "@uniswap/sdk-core": "^4.0.3", + "@uniswap/sdk-core": "4.0.7", "@uniswap/smart-order-router": "^3.15.0", "@uniswap/token-lists": "^1.0.0-beta.33", "@uniswap/uniswapx-sdk": "^1.4.1", diff --git a/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap b/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap index a894b013da..5cdbae0cd5 100644 --- a/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap +++ b/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap @@ -68,20 +68,24 @@ Object { "currencies": Array [ Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -115,11 +119,13 @@ Object { }, Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -143,11 +149,13 @@ Object { "currencies": Array [ Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -186,11 +194,13 @@ Object { "currencies": Array [ Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -214,20 +224,24 @@ Object { "currencies": Array [ Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, ], @@ -251,11 +265,13 @@ Object { "currencies": Array [ Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, ], @@ -279,20 +295,24 @@ Object { "currencies": Array [ Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -315,20 +335,24 @@ Object { "currencies": Array [ Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, Token { "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Wrapped Ether", + "sellFeeBps": undefined, "symbol": "WETH", }, ], @@ -352,11 +376,13 @@ Object { "currencies": Array [ Token { "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "DAI", + "sellFeeBps": undefined, "symbol": "DAI", }, ], diff --git a/src/utils/__snapshots__/getRoutingDiagramEntries.test.ts.snap b/src/utils/__snapshots__/getRoutingDiagramEntries.test.ts.snap index 65b93af9d8..07bc609652 100644 --- a/src/utils/__snapshots__/getRoutingDiagramEntries.test.ts.snap +++ b/src/utils/__snapshots__/getRoutingDiagramEntries.test.ts.snap @@ -7,20 +7,24 @@ Array [ Array [ Token { "address": "0x0000000000000000000000000000000000000001", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Abc", + "sellFeeBps": undefined, "symbol": "ABC", }, Token { "address": "0x0000000000000000000000000000000000000002", + "buyFeeBps": undefined, "chainId": 1, "decimals": 18, "isNative": false, "isToken": true, "name": "Def", + "sellFeeBps": undefined, "symbol": "DEF", }, 10000, diff --git a/yarn.lock b/yarn.lock index 36e480eca7..50cf78111b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6149,10 +6149,10 @@ "@uniswap/v2-sdk" "^3.2.0" "@uniswap/v3-sdk" "^3.10.0" -"@uniswap/sdk-core@>= 3", "@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2", "@uniswap/sdk-core@^4.0.3", "@uniswap/sdk-core@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.0.6.tgz#7b6d562f54293bbe0a9d101fb84e619db325f7b6" - integrity sha512-6GzCVfnOiJtvo91zlF/VjnC2OEbBRThVclzrh7+Zmo8dBovXwSlXwqn3RkSWACn/XEOzAKH70TficfOWm6mWJA== +"@uniswap/sdk-core@4.0.7", "@uniswap/sdk-core@>= 3", "@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2", "@uniswap/sdk-core@^4.0.3", "@uniswap/sdk-core@^4.0.6": + version "4.0.7" + resolved "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.0.7.tgz#90dfd070d7e44494234618af398da158363ae827" + integrity sha512-jscx7KUIWzQatcL5PHY6xy0gEL9IGQcL5h/obxzX9foP2KoNk9cq66Ia8I2Kvpa7zBcPOeW1hU0hJNBq6CzcIQ== dependencies: "@ethersproject/address" "^5.0.2" big.js "^5.2.2"