chore: merge remote-tracking branch 'origin/main' into mmackz/utils/add-create-types

Author: mmackz

.changeset/wicked-deers-marry.md

@@ -0,0 +1,5 @@
+---
+"@rabbitholegg/questdk-plugin-aerodrome": minor
+---
+
+add universal router contract

packages/aerodrome/src/Aerodrome.test.ts

@@ -1,6 +1,6 @@
 import { swap } from './Aerodrome'
 import { failingTestCases, passingTestCases } from './test-transactions'
-import { apply } from '@rabbitholegg/questdk/filter'
+import { apply } from '@rabbitholegg/questdk'
 import { describe, expect, test } from 'vitest'
 
 describe('Given the aerodrome plugin', () => {

packages/aerodrome/src/Aerodrome.ts

@@ -4,7 +4,7 @@ import {
   EXECUTE_ABI_FRAGMENTS,
   TOKENS_FOR_ETH_FRAGMENTS,
   TOKENS_FOR_TOKENS_FRAGMENTS,
-  UNIVERSAL_ROUTER,
+  UNIVERSAL_ROUTERS,
   V2_SWAP_EXACT_TYPES,
   V3_SWAP_EXACT_TYPES,
   WETH_ADDRESS,
@@ -30,7 +30,10 @@ export const swap = async (
     chainId,
     value: tokenIn === zeroAddress ? amountIn : undefined,
     to: {
-      $or: [AERODROME_ROUTER.toLowerCase(), UNIVERSAL_ROUTER.toLowerCase()],
+      $or: [
+        AERODROME_ROUTER.toLowerCase(),
+        ...UNIVERSAL_ROUTERS.map((r) => r.toLowerCase()),
+      ],
     },
     input: {
       $or: [

packages/aerodrome/src/constants.ts

@@ -1,5 +1,8 @@
 export const AERODROME_ROUTER = '0xcf77a3ba9a5ca399b7c97c74d54e5b1beb874e43'
-export const UNIVERSAL_ROUTER = '0xf07835bbf6eea0d05392fb4d3b9e5a333ca4da2a'
+export const UNIVERSAL_ROUTERS = [
+  '0xf07835bbf6eea0d05392fb4d3b9e5a333ca4da2a',
+  '0x6cb442acf35158d5eda88fe602221b67b400be3e',
+]
 export const WETH_ADDRESS = '0x4200000000000000000000000000000000000006'
 
 const ROUTER_ABI = [

packages/aerodrome/src/test-transactions.ts

@@ -97,12 +97,30 @@ export const SWAP_ERC20_V3: TestParams<SwapActionParams> = {
   },
 }
 
+export const SWAP_V3_NEW_ROUTER: TestParams<SwapActionParams> = {
+  transaction: {
+    chainId: 8453,
+    from: '0x1c37e98c0f9e36be11c50d803cd3069defe212b8',
+    hash: '0xb02952ed6cfdba1cf0ab9f3a9f69edeed46b93f127ccb9ad9c8a34ae6fe1439b',
+    input:
+      '0x24856bc300000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000108000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000001c37e98c0f9e36be11c50d803cd3069defe212b800000000000000000000000000000000000000000000000000038d7ea4c6800000000000000000000000000000000000000000000000000028af6a78bd7e60ad00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000004200000000000000000000000000000000000006000000000000000000000000dadc4f8e9d8d37294de0e02a2ce8cc0c90a4f6c20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dadc4f8e9d8d37294de0e02a2ce8cc0c90a4f6c2000000000000000000000000940181a94a35a4569e4529a3cdfb74e38fd986310000000000000000000000000000000000000000000000000000000000000000',
+    to: '0x6cb442acf35158d5eda88fe602221b67b400be3e',
+    value: '0',
+  },
+  params: {
+    chainId: 8453,
+    amountIn: GreaterThanOrEqual(1000000000000000n),
+    tokenIn: '0x4200000000000000000000000000000000000006',
+  },
+}
+
 export const passingTestCases = [
   createTestCase(ETH_FOR_TOKENS, 'when using swapExactETHForTokens'),
   createTestCase(TOKENS_FOR_ETH, 'when using swapExactTokensForETH'),
   createTestCase(TOKENS_FOR_TOKENS, 'when using swapExactTokensForTokens'),
   createTestCase(SWAP_ETH_V3, 'when using ETH V3'),
   createTestCase(SWAP_ERC20_V3, 'when using ERC20 V3'),
+  createTestCase(SWAP_V3_NEW_ROUTER, 'when using new router'),
   createTestCase(ETH_FOR_TOKENS, 'when using tokenIn is "Any"', {
     tokenIn: undefined,
   }),