merge main / conflicts

Uniswap · Jan 8, 2025 · ca7eef1 · ca7eef1
2 parents a0926b6 + 0e52d09
commit ca7eef1
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 47 deletions.
diff --git a/lib/util/defaultBlocksToLiveRoutesDB.ts b/lib/util/defaultBlocksToLiveRoutesDB.ts
@@ -20,10 +20,13 @@ export const DEFAULT_BLOCKS_TO_LIVE_ROUTES_DB: { [chain in ChainId]: number } =
   [ChainId.BASE_GOERLI]: 1800,
   [ChainId.ZORA_SEPOLIA]: 1800,
   [ChainId.BLAST]: 1800,
-  [ChainId.WORLDCHAIN]: 1800,
+  // Note: Experiment with longer TTL
+  // (12 hours) / (2 seconds) = 21600
+  [ChainId.WORLDCHAIN]: 21600,
   // (60 minutes) / (1 seconds) = 3600
   [ChainId.UNICHAIN_SEPOLIA]: 3600,
   [ChainId.UNICHAIN]: 3600,
+  [ChainId.MONAD_TESTNET]: 3600,
   // (60 minutes) / (250 milliseconds) = 14400
   [ChainId.ARBITRUM_ONE]: 14400,
   [ChainId.ARBITRUM_GOERLI]: 14400,

diff --git a/lib/util/extraV4FeeTiersTickSpacingsHookAddresses.ts b/lib/util/extraV4FeeTiersTickSpacingsHookAddresses.ts
@@ -45,6 +45,7 @@ export const EXTRA_V4_FEE_TICK_SPACINGS_HOOK_ADDRESSES: { [chain in ChainId]: Ar
   [ChainId.BLAST]: emptyV4FeeTickSpacingsHookAddresses,
   [ChainId.ZKSYNC]: emptyV4FeeTickSpacingsHookAddresses,
   [ChainId.WORLDCHAIN]: emptyV4FeeTickSpacingsHookAddresses,
-  [ChainId.UNICHAIN]: emptyV4FeeTickSpacingsHookAddresses,
   [ChainId.UNICHAIN_SEPOLIA]: emptyV4FeeTickSpacingsHookAddresses,
+  [ChainId.UNICHAIN]: emptyV4FeeTickSpacingsHookAddresses,
+  [ChainId.MONAD_TESTNET]: emptyV4FeeTickSpacingsHookAddresses,
 }
diff --git a/lib/util/hooksAddressesAllowlist.ts b/lib/util/hooksAddressesAllowlist.ts
@@ -31,6 +31,7 @@ export const HOOKS_ADDRESSES_ALLOWLIST: { [chain in ChainId]: Array<string> } =
   [ChainId.BLAST]: [ADDRESS_ZERO],
   [ChainId.ZKSYNC]: [ADDRESS_ZERO],
   [ChainId.WORLDCHAIN]: [ADDRESS_ZERO],
-  [ChainId.UNICHAIN]: [ADDRESS_ZERO],
   [ChainId.UNICHAIN_SEPOLIA]: [ADDRESS_ZERO],
+  [ChainId.UNICHAIN]: [ADDRESS_ZERO],
+  [ChainId.MONAD_TESTNET]: [ADDRESS_ZERO],
 }
diff --git a/lib/util/newCachedRoutesRolloutPercent.ts b/lib/util/newCachedRoutesRolloutPercent.ts
@@ -30,6 +30,7 @@ export const NEW_CACHED_ROUTES_ROLLOUT_PERCENT: { [chain in ChainId]: number } =
   [ChainId.BLAST]: 100,
   [ChainId.ZKSYNC]: 100,
   [ChainId.WORLDCHAIN]: 100,
-  [ChainId.UNICHAIN]: 100,
   [ChainId.UNICHAIN_SEPOLIA]: 100,
+  [ChainId.UNICHAIN]: 100,
+  [ChainId.MONAD_TESTNET]: 100,
 }
diff --git a/lib/util/onChainQuoteProviderConfigs.ts b/lib/util/onChainQuoteProviderConfigs.ts
@@ -800,6 +800,7 @@ export const NEW_QUOTER_DEPLOY_BLOCK: { [chainId in ChainId]: number } = {
   [ChainId.WORLDCHAIN]: -1,
   [ChainId.UNICHAIN_SEPOLIA]: -1,
   [ChainId.UNICHAIN]: -1,
+  [ChainId.MONAD_TESTNET]: -1,
 }
 
 // 0 threshold means it's not deployed yet
@@ -831,6 +832,7 @@ export const LIKELY_OUT_OF_GAS_THRESHOLD: { [chainId in ChainId]: number } = {
   [ChainId.WORLDCHAIN]: 0,
   [ChainId.UNICHAIN_SEPOLIA]: 0,
   [ChainId.UNICHAIN]: 0,
+  [ChainId.MONAD_TESTNET]: 0,
 }
 
 // TODO: Move this new addresses to SOR

diff --git a/lib/util/tenderlyNewEndpointRolloutPercent.ts b/lib/util/tenderlyNewEndpointRolloutPercent.ts
@@ -26,6 +26,7 @@ export const TENDERLY_NEW_ENDPOINT_ROLLOUT_PERCENT: { [chain in ChainId]: number
   [ChainId.BLAST]: 100,
   [ChainId.ZKSYNC]: 0,
   [ChainId.WORLDCHAIN]: 100,
-  [ChainId.UNICHAIN]: 0,
   [ChainId.UNICHAIN_SEPOLIA]: 0,
+  [ChainId.UNICHAIN]: 0,
+  [ChainId.MONAD_TESTNET]: 0,
 }
diff --git a/lib/util/testNets.ts b/lib/util/testNets.ts
@@ -12,4 +12,5 @@ export const TESTNETS = [
   ChainId.ARBITRUM_SEPOLIA,
   ChainId.ARBITRUM_GOERLI,
   ChainId.UNICHAIN_SEPOLIA,
+  ChainId.MONAD_TESTNET,
 ]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,14 +87,14 @@
     "@uniswap/default-token-list": "^11.13.0",
     "@uniswap/permit2-sdk": "^1.3.0",
     "@uniswap/router-sdk": "^1.15.0",
-    "@uniswap/sdk-core": "^6.0.0",
-    "@uniswap/smart-order-router": "file:/tmp/uniswap-smart-order-router-4.9.2.tgz",
+    "@uniswap/sdk-core": "^6.1.1",
+    "@uniswap/smart-order-router": "file:/tmp/uniswap-smart-order-router-4.10.0.tgz",
     "@uniswap/token-lists": "^1.0.0-beta.33",
-    "@uniswap/universal-router-sdk": "^4.7.0",
+    "@uniswap/universal-router-sdk": "^4.8.0",
     "@uniswap/v2-sdk": "^4.7.0",
     "@uniswap/v3-periphery": "^1.4.4",
     "@uniswap/v3-sdk": "^3.19.0",
-    "@uniswap/v4-sdk": "^1.12.0",
+    "@uniswap/v4-sdk": "^1.12.3",
     "async-retry": "^1.3.1",
     "aws-cdk-lib": "^2.137.0",
     "aws-embedded-metrics": "^2.0.6",

diff --git a/test/mocha/e2e/quote.test.ts b/test/mocha/e2e/quote.test.ts
@@ -2832,6 +2832,7 @@ describe('quote', function () {
     [ChainId.WORLDCHAIN]: () => USDC_ON(ChainId.WORLDCHAIN),
     [ChainId.UNICHAIN_SEPOLIA]: () => USDC_ON(ChainId.UNICHAIN_SEPOLIA),
     [ChainId.UNICHAIN]: () => USDC_ON(ChainId.UNICHAIN),
+    [ChainId.MONAD_TESTNET]: () => USDC_ON(ChainId.MONAD_TESTNET),
   }
 
   const TEST_ERC20_2: { [chainId in ChainId]: () => Token | null } = {
@@ -2863,6 +2864,7 @@ describe('quote', function () {
     [ChainId.WORLDCHAIN]: () => WLD_WORLDCHAIN,
     [ChainId.UNICHAIN_SEPOLIA]: () => WNATIVE_ON(ChainId.UNICHAIN_SEPOLIA),
     [ChainId.UNICHAIN]: () => WNATIVE_ON(ChainId.UNICHAIN),
+    [ChainId.MONAD_TESTNET]: () => WNATIVE_ON(ChainId.MONAD_TESTNET),
   }
 
   // TODO: Find valid pools/tokens on optimistic kovan and polygon mumbai. We skip those tests for now.
@@ -2880,7 +2882,9 @@ describe('quote', function () {
       // we have to disable sepolia tests for now
       // because they are testing V4_SEPOLIA_TEST_A -> V4_SEPOLIA_TEST_B
       // which no longer exists on re-deployed v4 pool manager
-      c != ChainId.SEPOLIA
+      c != ChainId.SEPOLIA &&
+      c != ChainId.UNICHAIN &&
+      c != ChainId.MONAD_TESTNET
   )) {
     for (const type of TRADE_TYPES) {
       const erc1 = TEST_ERC20_1[chain]()