From 38e5a1034ec623fbfacafc24198f7d7c4c6dead2 Mon Sep 17 00:00:00 2001
From: jsy1218 <91580504+jsy1218@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:37:29 -0800
Subject: [PATCH] bump sdk-core and v2-sdk

---
 package-lock.json     | 32 ++++++++++++++++----------------
 package.json          |  4 ++--
 src/util/addresses.ts |  9 +++------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7366cae5..e4b8d34a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,12 +13,12 @@
         "@uniswap/default-token-list": "^11.13.0",
         "@uniswap/permit2-sdk": "^1.2.0",
         "@uniswap/router-sdk": "^1.8.0",
-        "@uniswap/sdk-core": "^4.1.2",
+        "@uniswap/sdk-core": "^4.1.3",
         "@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": "^1.7.1",
-        "@uniswap/v2-sdk": "^4.2.0",
+        "@uniswap/v2-sdk": "^4.2.1",
         "@uniswap/v3-sdk": "^3.10.2",
         "async-retry": "^1.3.1",
         "await-timeout": "^1.1.1",
@@ -3135,9 +3135,9 @@
       }
     },
     "node_modules/@uniswap/sdk-core": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.1.2.tgz",
-      "integrity": "sha512-bk/oHiNCofy48ix84Q8aK/HHDmMVmk+SaoTq6U/93MmJ/nE7hbsckmY1c3MG2Vz1+jnGMCX9AmdBbnSF7VR5Ow==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.1.3.tgz",
+      "integrity": "sha512-dbXX4Ivam5D90gwiT0MWgHSiKdl99rC0GiPcK8Pd+iFp2myypPX9ovTR3IncI3Y83mZrlBLX9XC1Q6kA/12hOg==",
       "dependencies": {
         "@ethersproject/address": "^5.0.2",
         "big.js": "^5.2.2",
@@ -3262,13 +3262,13 @@
       }
     },
     "node_modules/@uniswap/v2-sdk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.2.0.tgz",
-      "integrity": "sha512-A8idv8g+efV+EgcLvENp9l9degexxjijcT4TmSKi6xio9Qi6s4knOO44IGZQAk5+vtpKfxRqAlzfOXLPwiXeRw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.2.1.tgz",
+      "integrity": "sha512-5dB3ULcRhWNeYLmDYczfmOYayIgsewRQgPaju/cdeGnb69PK+IpT/Q2tSRntRWSv1DhLSSBYIClD+lTRQ6gz/Q==",
       "dependencies": {
         "@ethersproject/address": "^5.0.0",
         "@ethersproject/solidity": "^5.0.0",
-        "@uniswap/sdk-core": "^4.0.7",
+        "@uniswap/sdk-core": "^4.1.3",
         "tiny-invariant": "^1.1.0",
         "tiny-warning": "^1.0.3"
       },
@@ -14081,9 +14081,9 @@
       }
     },
     "@uniswap/sdk-core": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.1.2.tgz",
-      "integrity": "sha512-bk/oHiNCofy48ix84Q8aK/HHDmMVmk+SaoTq6U/93MmJ/nE7hbsckmY1c3MG2Vz1+jnGMCX9AmdBbnSF7VR5Ow==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.1.3.tgz",
+      "integrity": "sha512-dbXX4Ivam5D90gwiT0MWgHSiKdl99rC0GiPcK8Pd+iFp2myypPX9ovTR3IncI3Y83mZrlBLX9XC1Q6kA/12hOg==",
       "requires": {
         "@ethersproject/address": "^5.0.2",
         "big.js": "^5.2.2",
@@ -14184,13 +14184,13 @@
       }
     },
     "@uniswap/v2-sdk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.2.0.tgz",
-      "integrity": "sha512-A8idv8g+efV+EgcLvENp9l9degexxjijcT4TmSKi6xio9Qi6s4knOO44IGZQAk5+vtpKfxRqAlzfOXLPwiXeRw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.2.1.tgz",
+      "integrity": "sha512-5dB3ULcRhWNeYLmDYczfmOYayIgsewRQgPaju/cdeGnb69PK+IpT/Q2tSRntRWSv1DhLSSBYIClD+lTRQ6gz/Q==",
       "requires": {
         "@ethersproject/address": "^5.0.0",
         "@ethersproject/solidity": "^5.0.0",
-        "@uniswap/sdk-core": "^4.0.7",
+        "@uniswap/sdk-core": "^4.1.3",
         "tiny-invariant": "^1.1.0",
         "tiny-warning": "^1.0.3"
       }
diff --git a/package.json b/package.json
index 8520daf51..af86362f2 100644
--- a/package.json
+++ b/package.json
@@ -35,12 +35,12 @@
     "@uniswap/default-token-list": "^11.13.0",
     "@uniswap/permit2-sdk": "^1.2.0",
     "@uniswap/router-sdk": "^1.8.0",
-    "@uniswap/sdk-core": "^4.1.2",
+    "@uniswap/sdk-core": "^4.1.3",
     "@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": "^1.7.1",
-    "@uniswap/v2-sdk": "^4.2.0",
+    "@uniswap/v2-sdk": "^4.2.1",
     "@uniswap/v3-sdk": "^3.10.2",
     "async-retry": "^1.3.1",
     "await-timeout": "^1.1.1",
diff --git a/src/util/addresses.ts b/src/util/addresses.ts
index 1c13f4cc8..766d33920 100644
--- a/src/util/addresses.ts
+++ b/src/util/addresses.ts
@@ -1,4 +1,4 @@
-import { ChainId, CHAIN_TO_ADDRESSES_MAP, Token } from '@uniswap/sdk-core';
+import { CHAIN_TO_ADDRESSES_MAP, ChainId, SWAP_ROUTER_02_ADDRESSES as SWAP_ROUTER_02_ADDRESSES_HELPER, Token } from '@uniswap/sdk-core';
 import { FACTORY_ADDRESS } from '@uniswap/v3-sdk';
 
 import { NETWORKS_WITH_SAME_UNISWAP_ADDRESSES } from './chains';
@@ -88,11 +88,8 @@ export const UNISWAP_MULTICALL_ADDRESSES: AddressMap = {
   // TODO: Gnosis + Moonbeam contracts to be deployed
 };
 
-export const SWAP_ROUTER_02_ADDRESSES = (chainId: number): string => {
-  if (chainId == ChainId.BNB) {
-    return BNB_SWAP_ROUTER_02_ADDRESS;
-  }
-  return '0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45';
+export const SWAP_ROUTER_02_ADDRESSES= (chainId: number): string => {
+  return SWAP_ROUTER_02_ADDRESSES_HELPER(chainId) ?? '0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45';
 };
 
 export const OVM_GASPRICE_ADDRESS =