From 3fc7bc8d4322a21f89e5cbafc07cb9d4fef81350 Mon Sep 17 00:00:00 2001 From: jsy1218 <91580504+jsy1218@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:20:32 -0800 Subject: [PATCH] chore: bump sor to 4.17.0 - feat: v4 for zora unichain blast L1 --- package-lock.json | 136 +++++++++++++++++++++--------------------- package.json | 12 ++-- src/util/addresses.ts | 10 ++++ 3 files changed, 84 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d8c24f43..e15a129a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,15 +13,15 @@ "@types/brotli": "^1.3.4", "@uniswap/default-token-list": "^11.13.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.20.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/router-sdk": "^1.21.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.1", "@uniswap/token-lists": "^1.0.0-beta.31", "@uniswap/universal-router": "^1.6.0", - "@uniswap/universal-router-sdk": "^4.13.0", - "@uniswap/v2-sdk": "^4.11.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0", + "@uniswap/universal-router-sdk": "^4.14.0", + "@uniswap/v2-sdk": "^4.13.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0", "async-retry": "^1.3.1", "await-timeout": "^1.1.1", "axios": "^0.21.1", @@ -3262,22 +3262,22 @@ } }, "node_modules/@uniswap/router-sdk": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.20.0.tgz", - "integrity": "sha512-nK07Pszyit3VFh4H88vedEXNVuPlfL8N77iCWlLac9QD+47T1AyZN7SL016S1mUGL8q9TeuXc16pk0TevAm1uA==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.21.0.tgz", + "integrity": "sha512-L7NixcJvcjkkX4WOa9mSyep1M2LMRp6gI0DKZGNuYsY+mjSJfxdlZyAKPXWHmVZGfVSE25IcbKZhA/i0KgVhKg==", "dependencies": { "@ethersproject/abi": "^5.5.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v2-sdk": "^4.11.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0" + "@uniswap/v2-sdk": "^4.13.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0" } }, "node_modules/@uniswap/sdk-core": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-7.3.0.tgz", - "integrity": "sha512-7Z/99PcS9w8TfQiSNh8wkrY7/RHElxmacCACTQOqN7qUFESZZ7+cCCBWzpE4ndbDH9FuSCEYxxmY0xhybdt6Uw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-7.5.0.tgz", + "integrity": "sha512-4eMbQTu+pEO6CGFG+G9M4ACFPephhfNPpRH40+GGgceHzs73OwQ+5v6Fw5e2JGxr/DEJrS/KcJ2Xjmg/QQ3D6Q==", "dependencies": { "@ethersproject/address": "^5.0.2", "@ethersproject/bytes": "^5.7.0", @@ -3344,20 +3344,20 @@ } }, "node_modules/@uniswap/universal-router-sdk": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.13.0.tgz", - "integrity": "sha512-vcwJIi79oS2cdBh1cRgFobG5IAbNw4PC3A66txC3DIb2PrWGt3QfrIaD5hs7a4YGj+ybWcCfNM5wS9DN9Xd9yg==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.14.0.tgz", + "integrity": "sha512-lM8o5olNxJSgaAXUotltSuobfjiDQhkS46XkRbJEDrFjmUDCqggUgegZjU4TFDC87d5LBF47TWYF9dAVQENjxg==", "dependencies": { "@openzeppelin/contracts": "4.7.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.20.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/router-sdk": "^1.21.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/universal-router": "2.0.0-beta.2", "@uniswap/v2-core": "^1.0.1", - "@uniswap/v2-sdk": "^4.11.0", + "@uniswap/v2-sdk": "^4.13.0", "@uniswap/v3-core": "1.0.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0", "bignumber.js": "^9.0.2", "ethers": "^5.7.0" }, @@ -3440,13 +3440,13 @@ } }, "node_modules/@uniswap/v2-sdk": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.11.0.tgz", - "integrity": "sha512-mIBtjLyHC4i4zm0dEtrIt/jsFOA7MhHtxL7zn4+eSYzKH6wSpWoLI+Fs4AD8KjvPSL9ZRbTp7+pkWRS6xfAmCg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.13.0.tgz", + "integrity": "sha512-Zsk5NgjtF+Qru1A6E3JDFMsUqa30TN2WjvIs09cZQfP79M86YuA2/dL5j+LfGDb1X6H2kjcVFDGoLamMQoK9Qw==", "dependencies": { "@ethersproject/address": "^5.0.2", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" }, @@ -3491,13 +3491,13 @@ } }, "node_modules/@uniswap/v3-sdk": { - "version": "3.23.0", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.23.0.tgz", - "integrity": "sha512-ZOsfo5QTNwJppWFdH38jDTPDoyJ4x7qcoAQQ5sT9ltNjuEG14URkQDXVbpHqJrIZmdbbDAVLq2jHeV0AU5GkSw==", + "version": "3.24.0", + "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.24.0.tgz", + "integrity": "sha512-RUo+JktfQwDyZX8M19GX7i6kMSCi+8zVMB+P0J+KZngwuY6eOBhvwIQWOkAFm553qXypSmrfzKu3177qLL3oTw==", "dependencies": { "@ethersproject/abi": "^5.5.0", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.0", "@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-staker": "1.0.0", @@ -3531,13 +3531,13 @@ } }, "node_modules/@uniswap/v4-sdk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.17.0.tgz", - "integrity": "sha512-j16xnwWt1OBEQ+79yi6/hosLpd510IMNpF16HEjqYUcecjdyirsf+DWXaUWwKgOECl+sqXFMAMXse3AzT+lpEQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.18.0.tgz", + "integrity": "sha512-ZcVSwgozrggfotH6D5g63W1T84bndsU1VZ+x67KM0Z8csBNzyV4GkKsMQPE4jnPEf3O0JSnGyHL2qPlpTHvGOQ==", "dependencies": { "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", - "@uniswap/v3-sdk": "3.23.0", + "@uniswap/sdk-core": "^7.5.0", + "@uniswap/v3-sdk": "3.24.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" }, @@ -14328,22 +14328,22 @@ } }, "@uniswap/router-sdk": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.20.0.tgz", - "integrity": "sha512-nK07Pszyit3VFh4H88vedEXNVuPlfL8N77iCWlLac9QD+47T1AyZN7SL016S1mUGL8q9TeuXc16pk0TevAm1uA==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.21.0.tgz", + "integrity": "sha512-L7NixcJvcjkkX4WOa9mSyep1M2LMRp6gI0DKZGNuYsY+mjSJfxdlZyAKPXWHmVZGfVSE25IcbKZhA/i0KgVhKg==", "requires": { "@ethersproject/abi": "^5.5.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v2-sdk": "^4.11.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0" + "@uniswap/v2-sdk": "^4.13.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0" } }, "@uniswap/sdk-core": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-7.3.0.tgz", - "integrity": "sha512-7Z/99PcS9w8TfQiSNh8wkrY7/RHElxmacCACTQOqN7qUFESZZ7+cCCBWzpE4ndbDH9FuSCEYxxmY0xhybdt6Uw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-7.5.0.tgz", + "integrity": "sha512-4eMbQTu+pEO6CGFG+G9M4ACFPephhfNPpRH40+GGgceHzs73OwQ+5v6Fw5e2JGxr/DEJrS/KcJ2Xjmg/QQ3D6Q==", "requires": { "@ethersproject/address": "^5.0.2", "@ethersproject/bytes": "^5.7.0", @@ -14409,20 +14409,20 @@ } }, "@uniswap/universal-router-sdk": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.13.0.tgz", - "integrity": "sha512-vcwJIi79oS2cdBh1cRgFobG5IAbNw4PC3A66txC3DIb2PrWGt3QfrIaD5hs7a4YGj+ybWcCfNM5wS9DN9Xd9yg==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.14.0.tgz", + "integrity": "sha512-lM8o5olNxJSgaAXUotltSuobfjiDQhkS46XkRbJEDrFjmUDCqggUgegZjU4TFDC87d5LBF47TWYF9dAVQENjxg==", "requires": { "@openzeppelin/contracts": "4.7.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.20.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/router-sdk": "^1.21.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/universal-router": "2.0.0-beta.2", "@uniswap/v2-core": "^1.0.1", - "@uniswap/v2-sdk": "^4.11.0", + "@uniswap/v2-sdk": "^4.13.0", "@uniswap/v3-core": "1.0.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0", "bignumber.js": "^9.0.2", "ethers": "^5.7.0" }, @@ -14480,13 +14480,13 @@ } }, "@uniswap/v2-sdk": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.11.0.tgz", - "integrity": "sha512-mIBtjLyHC4i4zm0dEtrIt/jsFOA7MhHtxL7zn4+eSYzKH6wSpWoLI+Fs4AD8KjvPSL9ZRbTp7+pkWRS6xfAmCg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.13.0.tgz", + "integrity": "sha512-Zsk5NgjtF+Qru1A6E3JDFMsUqa30TN2WjvIs09cZQfP79M86YuA2/dL5j+LfGDb1X6H2kjcVFDGoLamMQoK9Qw==", "requires": { "@ethersproject/address": "^5.0.2", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" } @@ -14521,13 +14521,13 @@ } }, "@uniswap/v3-sdk": { - "version": "3.23.0", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.23.0.tgz", - "integrity": "sha512-ZOsfo5QTNwJppWFdH38jDTPDoyJ4x7qcoAQQ5sT9ltNjuEG14URkQDXVbpHqJrIZmdbbDAVLq2jHeV0AU5GkSw==", + "version": "3.24.0", + "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.24.0.tgz", + "integrity": "sha512-RUo+JktfQwDyZX8M19GX7i6kMSCi+8zVMB+P0J+KZngwuY6eOBhvwIQWOkAFm553qXypSmrfzKu3177qLL3oTw==", "requires": { "@ethersproject/abi": "^5.5.0", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.0", "@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-staker": "1.0.0", @@ -14553,13 +14553,13 @@ } }, "@uniswap/v4-sdk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.17.0.tgz", - "integrity": "sha512-j16xnwWt1OBEQ+79yi6/hosLpd510IMNpF16HEjqYUcecjdyirsf+DWXaUWwKgOECl+sqXFMAMXse3AzT+lpEQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.18.0.tgz", + "integrity": "sha512-ZcVSwgozrggfotH6D5g63W1T84bndsU1VZ+x67KM0Z8csBNzyV4GkKsMQPE4jnPEf3O0JSnGyHL2qPlpTHvGOQ==", "requires": { "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^7.3.0", - "@uniswap/v3-sdk": "3.23.0", + "@uniswap/sdk-core": "^7.5.0", + "@uniswap/v3-sdk": "3.24.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" } diff --git a/package.json b/package.json index 4be50c188..9924afef1 100644 --- a/package.json +++ b/package.json @@ -37,15 +37,15 @@ "@types/brotli": "^1.3.4", "@uniswap/default-token-list": "^11.13.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.20.0", - "@uniswap/sdk-core": "^7.3.0", + "@uniswap/router-sdk": "^1.21.0", + "@uniswap/sdk-core": "^7.5.0", "@uniswap/swap-router-contracts": "^1.3.1", "@uniswap/token-lists": "^1.0.0-beta.31", "@uniswap/universal-router": "^1.6.0", - "@uniswap/universal-router-sdk": "^4.13.0", - "@uniswap/v2-sdk": "^4.11.0", - "@uniswap/v3-sdk": "^3.23.0", - "@uniswap/v4-sdk": "^1.17.0", + "@uniswap/universal-router-sdk": "^4.14.0", + "@uniswap/v2-sdk": "^4.13.0", + "@uniswap/v3-sdk": "^3.24.0", + "@uniswap/v4-sdk": "^1.18.0", "async-retry": "^1.3.1", "await-timeout": "^1.1.1", "axios": "^0.21.1", diff --git a/src/util/addresses.ts b/src/util/addresses.ts index e2271db9a..0b0c87202 100644 --- a/src/util/addresses.ts +++ b/src/util/addresses.ts @@ -124,7 +124,12 @@ export const PROTOCOL_V4_QUOTER_ADDRESSES: AddressMap = { [ChainId.BNB]: CHAIN_TO_ADDRESSES_MAP[ChainId.BNB].v4QuoterAddress, [ChainId.AVALANCHE]: CHAIN_TO_ADDRESSES_MAP[ChainId.AVALANCHE].v4QuoterAddress, [ChainId.OPTIMISM]: CHAIN_TO_ADDRESSES_MAP[ChainId.OPTIMISM].v4QuoterAddress, + [ChainId.WORLDCHAIN]: CHAIN_TO_ADDRESSES_MAP[ChainId.WORLDCHAIN].v4QuoterAddress, [ChainId.ZORA]: CHAIN_TO_ADDRESSES_MAP[ChainId.ZORA].v4QuoterAddress, + [ChainId.UNICHAIN_SEPOLIA]: CHAIN_TO_ADDRESSES_MAP[ChainId.UNICHAIN_SEPOLIA].v4QuoterAddress, + [ChainId.UNICHAIN]: CHAIN_TO_ADDRESSES_MAP[ChainId.UNICHAIN].v4QuoterAddress, + [ChainId.BLAST]: CHAIN_TO_ADDRESSES_MAP[ChainId.BLAST].v4QuoterAddress, + [ChainId.MAINNET]: CHAIN_TO_ADDRESSES_MAP[ChainId.MAINNET].v4QuoterAddress, }; export const MIXED_ROUTE_QUOTER_V1_ADDRESSES: AddressMap = { @@ -191,6 +196,11 @@ export const STATE_VIEW_ADDRESSES: AddressMap = { [ChainId.OPTIMISM]: CHAIN_TO_ADDRESSES_MAP[ChainId.OPTIMISM].v4StateView, [ChainId.AVALANCHE]: CHAIN_TO_ADDRESSES_MAP[ChainId.AVALANCHE].v4StateView, [ChainId.WORLDCHAIN]: CHAIN_TO_ADDRESSES_MAP[ChainId.WORLDCHAIN].v4StateView, + [ChainId.ZORA]: CHAIN_TO_ADDRESSES_MAP[ChainId.ZORA].v4StateView, + [ChainId.UNICHAIN_SEPOLIA]: CHAIN_TO_ADDRESSES_MAP[ChainId.UNICHAIN_SEPOLIA].v4StateView, + [ChainId.UNICHAIN]: CHAIN_TO_ADDRESSES_MAP[ChainId.UNICHAIN].v4StateView, + [ChainId.BLAST]: CHAIN_TO_ADDRESSES_MAP[ChainId.BLAST].v4StateView, + [ChainId.MAINNET]: CHAIN_TO_ADDRESSES_MAP[ChainId.MAINNET].v4StateView, }; export const OVM_GASPRICE_ADDRESS =