From 0e52d09105c30a2158d0d32182b275c900e4457f Mon Sep 17 00:00:00 2001 From: "Siyu Jiang (See-You John)" <91580504+jsy1218@users.noreply.github.com> Date: Wed, 8 Jan 2025 07:51:56 -0800 Subject: [PATCH] chore: bump sor to 4.10.0 - fix: update deploy address for v4 on sepolia and unichain sepolia (#956) --- bin/app.ts | 6 +- lib/cron/cache-config.ts | 4 +- .../rpc-providers-widgets-factory.ts | 2 +- lib/graphql/graphql-provider.ts | 4 +- lib/handlers/injector-sor.ts | 4 +- ...e-provider-traffic-switch-configuration.ts | 4 +- lib/handlers/shared.ts | 2 +- lib/rpc/utils.ts | 4 +- lib/util/defaultBlocksToLiveRoutesDB.ts | 4 +- ...xtraV4FeeTiersTickSpacingsHookAddresses.ts | 4 +- lib/util/gasLimit.ts | 4 +- lib/util/hooksAddressesAllowlist.ts | 4 +- lib/util/newCachedRoutesRolloutPercent.ts | 4 +- lib/util/onChainQuoteProviderConfigs.ts | 42 ++-- lib/util/tenderlyNewEndpointRolloutPercent.ts | 4 +- lib/util/testNets.ts | 3 +- package-lock.json | 191 +++++++----------- package.json | 8 +- test/mocha/e2e/quote.test.ts | 20 +- test/utils/tokens.ts | 6 +- 20 files changed, 155 insertions(+), 169 deletions(-) diff --git a/bin/app.ts b/bin/app.ts index e669f10d29..d4066ebbef 100644 --- a/bin/app.ts +++ b/bin/app.ts @@ -181,7 +181,7 @@ export class RoutingAPIPipeline extends Stack { // Load RPC provider URLs from AWS secret let jsonRpcProviders = {} as { [chainId: string]: string } SUPPORTED_CHAINS.forEach((chainId: ChainId) => { - if (chainId !== ChainId.WORLDCHAIN && chainId !== ChainId.ASTROCHAIN_SEPOLIA) { + if (chainId !== ChainId.WORLDCHAIN && chainId !== ChainId.UNICHAIN_SEPOLIA) { const key = `WEB3_RPC_${chainId}` jsonRpcProviders[key] = jsonRpcProvidersSecret.secretValueFromJson(key).toString() new CfnOutput(this, key, { @@ -234,7 +234,7 @@ export class RoutingAPIPipeline extends Stack { 'ALCHEMY_324', // WorldChain, 'QUICKNODE_480', - // AstroChain Sepolia, + // Unichain Sepolia, 'QUICKNODE_1301', // unirpc - serves all chains 'UNIRPC_0', @@ -410,7 +410,7 @@ const jsonRpcProviders = { ALCHEMY_324: process.env.ALCHEMY_324!, // WorldChain, QUICKNODE_480: process.env.QUICKNODE_480!, - // AstroChain Sepolia, + // Unichain Sepolia, QUICKNODE_1301: process.env.QUICKNODE_1301!, // unirpc - serves all chains UNIRPC_0: process.env.UNIRPC_0!, diff --git a/lib/cron/cache-config.ts b/lib/cron/cache-config.ts index 98e026e993..16cc3340ac 100644 --- a/lib/cron/cache-config.ts +++ b/lib/cron/cache-config.ts @@ -37,7 +37,7 @@ export const v3SubgraphUrlOverride = (chainId: ChainId) => { return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v3-celo/api` case ChainId.WORLDCHAIN: return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v3-worldchain/api` - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v3-astrochain-sepolia/api` default: return undefined @@ -64,7 +64,7 @@ export const v2SubgraphUrlOverride = (chainId: ChainId) => { return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v2-base/api` case ChainId.WORLDCHAIN: return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v2-worldchain/api` - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: return `https://subgraph.satsuma-prod.com/${process.env.ALCHEMY_QUERY_KEY}/uniswap/uniswap-v2-astrochain-sepolia/api` default: return undefined diff --git a/lib/dashboards/rpc-providers-widgets-factory.ts b/lib/dashboards/rpc-providers-widgets-factory.ts index 08e0a4b614..5c6975b4a2 100644 --- a/lib/dashboards/rpc-providers-widgets-factory.ts +++ b/lib/dashboards/rpc-providers-widgets-factory.ts @@ -20,7 +20,7 @@ const ID_TO_PROVIDER = (id: ChainId): string => { case ChainId.CELO: case ChainId.BNB: case ChainId.BASE: - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: return ProviderName.QUIKNODE case ChainId.CELO_ALFAJORES: return ProviderName.FORNO diff --git a/lib/graphql/graphql-provider.ts b/lib/graphql/graphql-provider.ts index 491da7a8d0..9a016073cd 100644 --- a/lib/graphql/graphql-provider.ts +++ b/lib/graphql/graphql-provider.ts @@ -59,8 +59,8 @@ export class UniGraphQLProvider implements IUniGraphQLProvider { return 'ZKSYNC' case ChainId.WORLDCHAIN: return 'WORLDCHAIN' - case ChainId.ASTROCHAIN_SEPOLIA: - return 'ASTROCHAIN' + case ChainId.UNICHAIN_SEPOLIA: + return 'UNICHAIN_SEPOLIA' default: throw new Error(`UniGraphQLProvider._chainIdToGraphQLChainName unsupported ChainId: ${chainId}`) } diff --git a/lib/handlers/injector-sor.ts b/lib/handlers/injector-sor.ts index 80c308c37c..81c884de49 100644 --- a/lib/handlers/injector-sor.ts +++ b/lib/handlers/injector-sor.ts @@ -108,7 +108,7 @@ export const SUPPORTED_CHAINS: ChainId[] = [ ChainId.ZORA, ChainId.ZKSYNC, ChainId.WORLDCHAIN, - ChainId.ASTROCHAIN_SEPOLIA, + ChainId.UNICHAIN_SEPOLIA, ] const DEFAULT_TOKEN_LIST = 'https://gateway.ipfs.io/ipns/tokens.uniswap.org' @@ -366,7 +366,7 @@ export abstract class InjectorSOR extends Injector< case ChainId.ZORA: case ChainId.ZKSYNC: case ChainId.WORLDCHAIN: - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: const currentQuoteProvider = new OnChainQuoteProvider( chainId, provider, diff --git a/lib/handlers/quote/util/quote-provider-traffic-switch-configuration.ts b/lib/handlers/quote/util/quote-provider-traffic-switch-configuration.ts index ae600ead27..7f640d4caf 100644 --- a/lib/handlers/quote/util/quote-provider-traffic-switch-configuration.ts +++ b/lib/handlers/quote/util/quote-provider-traffic-switch-configuration.ts @@ -227,9 +227,9 @@ export const QUOTE_PROVIDER_TRAFFIC_SWITCH_CONFIGURATION = ( samplingExactOutPercentage: 0, } as QuoteProviderTrafficSwitchConfiguration } - // worldchain and astrochain sepolia don't have the view-only quoter yet, so we can shadow sample 0.1% of traffic + // worldchain and unichain sepolia don't have the view-only quoter yet, so we can shadow sample 0.1% of traffic case ChainId.WORLDCHAIN: - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: switch (protocol) { case Protocol.MIXED: case Protocol.V4: diff --git a/lib/handlers/shared.ts b/lib/handlers/shared.ts index fea85a96ea..cb3ee4dd8d 100644 --- a/lib/handlers/shared.ts +++ b/lib/handlers/shared.ts @@ -82,7 +82,7 @@ export const DEFAULT_ROUTING_CONFIG_BY_CHAIN = (chainId: ChainId): AlphaRouterCo } case ChainId.OPTIMISM: case ChainId.WORLDCHAIN: - case ChainId.ASTROCHAIN_SEPOLIA: + case ChainId.UNICHAIN_SEPOLIA: return { v2PoolSelection: { topN: 3, diff --git a/lib/rpc/utils.ts b/lib/rpc/utils.ts index b01a25fb3b..833ef11d2e 100644 --- a/lib/rpc/utils.ts +++ b/lib/rpc/utils.ts @@ -20,8 +20,8 @@ export function chainIdToNetworkName(networkId: ChainId): string { return 'base' case ChainId.WORLDCHAIN: return 'worldchain' - case ChainId.ASTROCHAIN_SEPOLIA: - return 'astrochain-sepolia' + case ChainId.UNICHAIN_SEPOLIA: + return 'unichain-sepolia' default: return 'ethereum' } diff --git a/lib/util/defaultBlocksToLiveRoutesDB.ts b/lib/util/defaultBlocksToLiveRoutesDB.ts index a08f3187b0..d116f17031 100644 --- a/lib/util/defaultBlocksToLiveRoutesDB.ts +++ b/lib/util/defaultBlocksToLiveRoutesDB.ts @@ -24,7 +24,9 @@ export const DEFAULT_BLOCKS_TO_LIVE_ROUTES_DB: { [chain in ChainId]: number } = // (12 hours) / (2 seconds) = 21600 [ChainId.WORLDCHAIN]: 21600, // (60 minutes) / (1 seconds) = 3600 - [ChainId.ASTROCHAIN_SEPOLIA]: 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 index 389a7f7e2a..c80cb5bdcf 100644 --- a/lib/util/extraV4FeeTiersTickSpacingsHookAddresses.ts +++ b/lib/util/extraV4FeeTiersTickSpacingsHookAddresses.ts @@ -45,5 +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.ASTROCHAIN_SEPOLIA]: emptyV4FeeTickSpacingsHookAddresses, + [ChainId.UNICHAIN_SEPOLIA]: emptyV4FeeTickSpacingsHookAddresses, + [ChainId.UNICHAIN]: emptyV4FeeTickSpacingsHookAddresses, + [ChainId.MONAD_TESTNET]: emptyV4FeeTickSpacingsHookAddresses, } diff --git a/lib/util/gasLimit.ts b/lib/util/gasLimit.ts index fe6febf021..68a3f9175a 100644 --- a/lib/util/gasLimit.ts +++ b/lib/util/gasLimit.ts @@ -7,7 +7,7 @@ export const CELO_UPPER_SWAP_GAS_LIMIT = BigNumber.from(5000000) // https://github.com/Uniswap/routing-api/blob/fe410751985995cb2904837e24f22da7dca1f518/lib/util/onChainQuoteProviderConfigs.ts#L340 divivde by 10 export const WORLDCHAIN_UPPER_SWAP_GAS_LIMIT = BigNumber.from(300000) // https://github.com/Uniswap/routing-api/blob/fe410751985995cb2904837e24f22da7dca1f518/lib/util/onChainQuoteProviderConfigs.ts#L344 divivde by 10 -export const ASTROCHAIN_SEPOLIA_UPPER_SWAP_GAS_LIMIT = BigNumber.from(300000) +export const UNICHAIN_SEPOLIA_UPPER_SWAP_GAS_LIMIT = BigNumber.from(300000) // https://github.com/Uniswap/smart-order-router/blob/c77d04d334cc1c6694bd74d88287cc5b6e3a7425/src/util/onchainQuoteProviderConfigs.ts#L83 divide by 10 export const BNB_UPPER_SWAP_GAS_LIMIT = BigNumber.from(200000) // https://github.com/Uniswap/smart-order-router/blob/c77d04d334cc1c6694bd74d88287cc5b6e3a7425/src/util/onchainQuoteProviderConfigs.ts#L83 divide by 10 @@ -17,7 +17,7 @@ export const CHAIN_TO_GAS_LIMIT_MAP: { [chainId: number]: BigNumber } = { [ChainId.ZKSYNC]: ZKSYNC_UPPER_SWAP_GAS_LIMIT, [ChainId.CELO]: CELO_UPPER_SWAP_GAS_LIMIT, [ChainId.CELO_ALFAJORES]: CELO_UPPER_SWAP_GAS_LIMIT, - [ChainId.ASTROCHAIN_SEPOLIA]: ASTROCHAIN_SEPOLIA_UPPER_SWAP_GAS_LIMIT, + [ChainId.UNICHAIN_SEPOLIA]: UNICHAIN_SEPOLIA_UPPER_SWAP_GAS_LIMIT, [ChainId.BNB]: BNB_UPPER_SWAP_GAS_LIMIT, [ChainId.ZORA]: ZORA_UPPER_SWAP_GAS_LIMIT, } diff --git a/lib/util/hooksAddressesAllowlist.ts b/lib/util/hooksAddressesAllowlist.ts index f339efb190..49172726d4 100644 --- a/lib/util/hooksAddressesAllowlist.ts +++ b/lib/util/hooksAddressesAllowlist.ts @@ -31,5 +31,7 @@ export const HOOKS_ADDRESSES_ALLOWLIST: { [chain in ChainId]: Array } = [ChainId.BLAST]: [ADDRESS_ZERO], [ChainId.ZKSYNC]: [ADDRESS_ZERO], [ChainId.WORLDCHAIN]: [ADDRESS_ZERO], - [ChainId.ASTROCHAIN_SEPOLIA]: [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 index 9e1260ab1a..277e7cfdbd 100644 --- a/lib/util/newCachedRoutesRolloutPercent.ts +++ b/lib/util/newCachedRoutesRolloutPercent.ts @@ -30,5 +30,7 @@ export const NEW_CACHED_ROUTES_ROLLOUT_PERCENT: { [chain in ChainId]: number } = [ChainId.BLAST]: 100, [ChainId.ZKSYNC]: 100, [ChainId.WORLDCHAIN]: 100, - [ChainId.ASTROCHAIN_SEPOLIA]: 100, + [ChainId.UNICHAIN_SEPOLIA]: 100, + [ChainId.UNICHAIN]: 100, + [ChainId.MONAD_TESTNET]: 100, } diff --git a/lib/util/onChainQuoteProviderConfigs.ts b/lib/util/onChainQuoteProviderConfigs.ts index 160bfa6c18..3eef628482 100644 --- a/lib/util/onChainQuoteProviderConfigs.ts +++ b/lib/util/onChainQuoteProviderConfigs.ts @@ -47,7 +47,7 @@ export const RETRY_OPTIONS: { [chainId: number]: AsyncRetry.Options | undefined minTimeout: 100, maxTimeout: 1000, }, - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { retries: 2, minTimeout: 100, maxTimeout: 1000, @@ -116,7 +116,7 @@ export const OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol]: { quoteMinSuccessRate: 0.1, }, // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -181,7 +181,7 @@ export const OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol]: { quoteMinSuccessRate: 0.1, }, // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -247,7 +247,7 @@ export const OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol]: { quoteMinSuccessRate: 0.1, }, // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -306,8 +306,8 @@ export const OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol]: { gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, }, - // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + // TODO: once unichain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -377,8 +377,8 @@ export const NON_OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol] gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, }, - // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + // TODO: once unichain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -442,8 +442,8 @@ export const NON_OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol] gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, }, - // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + // TODO: once unichain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -508,8 +508,8 @@ export const NON_OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol] gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, }, - // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + // TODO: once unichain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -568,8 +568,8 @@ export const NON_OPTIMISTIC_CACHED_ROUTES_BATCH_PARAMS: { [protocol in Protocol] gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, }, - // TODO: once astrochain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall - [ChainId.ASTROCHAIN_SEPOLIA]: { + // TODO: once unichain-sepolia has view-quoter, optimize muilcallChunk and gasLimitPerCall + [ChainId.UNICHAIN_SEPOLIA]: { multicallChunk: 80, gasLimitPerCall: 1_200_000, quoteMinSuccessRate: 0.1, @@ -607,7 +607,7 @@ export const GAS_ERROR_FAILURE_OVERRIDES: { [chainId: number]: FailureOverrides gasLimitOverride: 3_000_000, multicallChunk: 45, }, - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { gasLimitOverride: 3_000_000, multicallChunk: 45, }, @@ -643,7 +643,7 @@ export const SUCCESS_RATE_FAILURE_OVERRIDES: { [chainId: number]: FailureOverrid gasLimitOverride: 3_000_000, multicallChunk: 45, }, - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { gasLimitOverride: 3_000_000, multicallChunk: 45, }, @@ -691,7 +691,7 @@ export const BLOCK_NUMBER_CONFIGS: { [chainId: number]: BlockNumberConfig } = { rollbackBlockOffset: -20, }, }, - [ChainId.ASTROCHAIN_SEPOLIA]: { + [ChainId.UNICHAIN_SEPOLIA]: { baseBlockOffset: -25, rollback: { enabled: true, @@ -729,7 +729,9 @@ export const NEW_QUOTER_DEPLOY_BLOCK: { [chainId in ChainId]: number } = { [ChainId.BLAST]: 2370179, [ChainId.ZKSYNC]: 35982078, [ChainId.WORLDCHAIN]: -1, - [ChainId.ASTROCHAIN_SEPOLIA]: -1, + [ChainId.UNICHAIN_SEPOLIA]: -1, + [ChainId.UNICHAIN]: -1, + [ChainId.MONAD_TESTNET]: -1, } // 0 threshold means it's not deployed yet @@ -759,7 +761,9 @@ export const LIKELY_OUT_OF_GAS_THRESHOLD: { [chainId in ChainId]: number } = { [ChainId.BLAST]: 17540 * 2, // 17540 is the single tick.cross cost on blast. We multiply by 2 to be safe, [ChainId.ZKSYNC]: 17540 * 2, // 17540 is the single tick.cross cost on zkSync. We multiply by 2 to be safe [ChainId.WORLDCHAIN]: 0, - [ChainId.ASTROCHAIN_SEPOLIA]: 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 index 39c4553df6..059add8013 100644 --- a/lib/util/tenderlyNewEndpointRolloutPercent.ts +++ b/lib/util/tenderlyNewEndpointRolloutPercent.ts @@ -26,5 +26,7 @@ export const TENDERLY_NEW_ENDPOINT_ROLLOUT_PERCENT: { [chain in ChainId]: number [ChainId.BLAST]: 100, [ChainId.ZKSYNC]: 0, [ChainId.WORLDCHAIN]: 100, - [ChainId.ASTROCHAIN_SEPOLIA]: 0, + [ChainId.UNICHAIN_SEPOLIA]: 0, + [ChainId.UNICHAIN]: 0, + [ChainId.MONAD_TESTNET]: 0, } diff --git a/lib/util/testNets.ts b/lib/util/testNets.ts index e7df5148a3..ae0f301a12 100644 --- a/lib/util/testNets.ts +++ b/lib/util/testNets.ts @@ -11,5 +11,6 @@ export const TESTNETS = [ ChainId.OPTIMISM_GOERLI, ChainId.ARBITRUM_SEPOLIA, ChainId.ARBITRUM_GOERLI, - ChainId.ASTROCHAIN_SEPOLIA, + ChainId.UNICHAIN_SEPOLIA, + ChainId.MONAD_TESTNET, ] diff --git a/package-lock.json b/package-lock.json index 1564d4a41d..dbe58931c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,14 +28,14 @@ "@uniswap/default-token-list": "^11.13.0", "@uniswap/permit2-sdk": "^1.3.0", "@uniswap/router-sdk": "^1.14.0", - "@uniswap/sdk-core": "^5.9.0", - "@uniswap/smart-order-router": "4.9.2", + "@uniswap/sdk-core": "^6.1.1", + "@uniswap/smart-order-router": "4.10.0", "@uniswap/token-lists": "^1.0.0-beta.33", - "@uniswap/universal-router-sdk": "^4.6.1", + "@uniswap/universal-router-sdk": "^4.8.0", "@uniswap/v2-sdk": "^4.6.1", "@uniswap/v3-periphery": "^1.4.4", "@uniswap/v3-sdk": "^3.17.1", - "@uniswap/v4-sdk": "^1.11.2", + "@uniswap/v4-sdk": "^1.12.3", "async-retry": "^1.3.1", "aws-cdk-lib": "^2.137.0", "aws-embedded-metrics": "^2.0.6", @@ -4476,22 +4476,22 @@ } }, "node_modules/@uniswap/router-sdk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.14.2.tgz", - "integrity": "sha512-RvTAsKANG5iLDMk9O/F05wZOMTg8qPw5BBCTkpQYM4o6Mz92wziaD5r52O6KzzOXvZizC/7YJ5BAAcr25slSQw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.15.0.tgz", + "integrity": "sha512-KYzpxHX07O2hon9qMudzmtu/+epmnTzva1ZngdJ29CmRXT7C56yz8vSeLXWVvVEp5/m7TcDxbBS5wkY+WHuLDA==", "dependencies": { "@ethersproject/abi": "^5.5.0", - "@uniswap/sdk-core": "^5.8.0", + "@uniswap/sdk-core": "^6.0.0", "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v2-sdk": "^4.6.0", - "@uniswap/v3-sdk": "^3.17.0", - "@uniswap/v4-sdk": "^1.9.0" + "@uniswap/v2-sdk": "^4.7.0", + "@uniswap/v3-sdk": "^3.19.0", + "@uniswap/v4-sdk": "^1.12.0" } }, "node_modules/@uniswap/sdk-core": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-5.9.0.tgz", - "integrity": "sha512-OME7WR6+5QwQs45A2079r+/FS0zU944+JCQwUX9GyIriCxqw2pGu4F9IEqmlwD+zSIMml0+MJnJJ47pFgSyWDw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-6.1.1.tgz", + "integrity": "sha512-S9D5NTn7vV+wYwXbKOmYVjJidgmKY6zUsG5KGlQO4fNvcIde1TtVgtMXJl06qv1JeJKbGnzkIAZG4R82lSVZCg==", "dependencies": { "@ethersproject/address": "^5.0.2", "@ethersproject/bytes": "^5.7.0", @@ -4508,23 +4508,23 @@ } }, "node_modules/@uniswap/smart-order-router": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.9.2.tgz", - "integrity": "sha512-vAb5x5tGC71GlAgvZj2WczYD/yV0MemJbFmSle/9sokD+qlcgw48hiHaAEzne+bHSHYFfoRr5gsxDeJojsdDug==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.10.0.tgz", + "integrity": "sha512-a9pZKEA5GOAdczB5ba8y381005eNZtDwyGzVPfZM2rvOpEsfLD9/M9olOeI+BxzHYeIrwxjv2sUL47jbg2YqWg==", "dependencies": { "@eth-optimism/sdk": "^3.2.2", "@types/brotli": "^1.3.4", "@uniswap/default-token-list": "^11.13.0", "@uniswap/permit2-sdk": "^1.3.0", "@uniswap/router-sdk": "^1.14.0", - "@uniswap/sdk-core": "^5.9.0", + "@uniswap/sdk-core": "^6.1.1", "@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.6.1", + "@uniswap/universal-router-sdk": "^4.8.0", "@uniswap/v2-sdk": "^4.6.1", "@uniswap/v3-sdk": "^3.17.1", - "@uniswap/v4-sdk": "^1.10.0", + "@uniswap/v4-sdk": "^1.12.3", "async-retry": "^1.3.1", "await-timeout": "^1.1.1", "axios": "^0.21.1", @@ -4605,20 +4605,20 @@ } }, "node_modules/@uniswap/universal-router-sdk": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.6.1.tgz", - "integrity": "sha512-HfPYd8xz3/Sjb8if/wAPFOzj0+m7173PVLy+VzF4HrbBwDreU0amYHwf4zQBjffXmys2QtOdwfu7BfZrUwx0kQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.8.0.tgz", + "integrity": "sha512-lpk+j5i7ZSpOP/WIJR8x6A6Hvj/6SMyNVbrI5xNRqz00iCOUqEXRF07QCKMwgvB2IccZGz3u88UVm/KUVLGpJw==", "dependencies": { "@openzeppelin/contracts": "4.7.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.14.2", - "@uniswap/sdk-core": "^5.8.2", + "@uniswap/router-sdk": "^1.15.0", + "@uniswap/sdk-core": "^6.1.1", "@uniswap/universal-router": "2.0.0-beta.2", "@uniswap/v2-core": "^1.0.1", - "@uniswap/v2-sdk": "^4.6.0", + "@uniswap/v2-sdk": "^4.7.0", "@uniswap/v3-core": "1.0.0", - "@uniswap/v3-sdk": "^3.18.1", - "@uniswap/v4-sdk": "^1.10.0", + "@uniswap/v3-sdk": "^3.19.0", + "@uniswap/v4-sdk": "^1.12.3", "bignumber.js": "^9.0.2", "ethers": "^5.7.0" }, @@ -4663,13 +4663,13 @@ } }, "node_modules/@uniswap/v2-sdk": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.6.1.tgz", - "integrity": "sha512-oTJGBPecrNSPMEp4ujDYzyWPNgZ/kS1VR6MGotnjjGsvQ1btm55AO1OR2KoX85bEs7uUSDyQ/r/0p22+g2fgJA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.7.0.tgz", + "integrity": "sha512-CShitWRbydaigNF5GfNNCgGH9GXKMI/HD6ThI4T7FoSZkf2pgTXlX1fQ829xbl1ohKO61n4NjZs/HzGKIV5yjQ==", "dependencies": { "@ethersproject/address": "^5.0.2", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.8.1", + "@uniswap/sdk-core": "^6.0.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" }, @@ -4706,13 +4706,13 @@ "integrity": "sha512-W6QmqgkADuFcTLzHL8vVoNBtkwjvQRpYIAom7KiUNoLKghyx3FgH0GBjt8NRvigV1ZmMOBllvE1By1C+bi8WpA==" }, "node_modules/@uniswap/v3-sdk": { - "version": "3.18.1", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.18.1.tgz", - "integrity": "sha512-TGrKLToSWwfx6VV2d7fh4kwQMlgspXTLE49ep5zfYODVVqV6WhrRdbteHb3e0bjdjxGSj0gzoLmhsjmoJTE1/g==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.19.0.tgz", + "integrity": "sha512-HbX3YjHJRXI2LFCxLUWgPfRZX6N9a+cELJ3Dus5vYDPYYjFOwJr16c2esDsdHUe3TG2oOeA/u2wv9TDT2GSBIw==", "dependencies": { "@ethersproject/abi": "^5.5.0", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.8.1", + "@uniswap/sdk-core": "^6.0.0", "@uniswap/swap-router-contracts": "^1.3.0", "@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-staker": "1.0.0", @@ -4738,13 +4738,13 @@ } }, "node_modules/@uniswap/v4-sdk": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.11.2.tgz", - "integrity": "sha512-vrAHv13J7LdAsqBkYEkaChc9D3tY9vsEd0YbUwLraC6AUCYGxb2sCEyg+tse5RDicDd0aqiEwyq8OHnCI1R3aQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.12.3.tgz", + "integrity": "sha512-m1SALxCrkG8uY5mZ50XMBjALEh1diFD+MfwAYcEARAH6kwVNZZk2MAEOq3QUm2YqHWmjcfQZPnvMmV3f0iHgZg==", "dependencies": { "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.3.1", - "@uniswap/v3-sdk": "3.12.0", + "@uniswap/sdk-core": "^6.0.0", + "@uniswap/v3-sdk": "3.19.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" }, @@ -4752,24 +4752,6 @@ "node": ">=14" } }, - "node_modules/@uniswap/v4-sdk/node_modules/@uniswap/v3-sdk": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.12.0.tgz", - "integrity": "sha512-mUCg9HLKl20h6W8+QtELqN/uaO47/KDSf+EOht+W3C6jt2eGuzSANqS2CY7i8MsAsnZ+MjPhmN+JTOIvf7azfA==", - "dependencies": { - "@ethersproject/abi": "^5.5.0", - "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.0.0", - "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v3-periphery": "^1.1.1", - "@uniswap/v3-staker": "1.0.0", - "tiny-invariant": "^1.1.0", - "tiny-warning": "^1.0.3" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", @@ -27930,22 +27912,22 @@ } }, "@uniswap/router-sdk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.14.2.tgz", - "integrity": "sha512-RvTAsKANG5iLDMk9O/F05wZOMTg8qPw5BBCTkpQYM4o6Mz92wziaD5r52O6KzzOXvZizC/7YJ5BAAcr25slSQw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@uniswap/router-sdk/-/router-sdk-1.15.0.tgz", + "integrity": "sha512-KYzpxHX07O2hon9qMudzmtu/+epmnTzva1ZngdJ29CmRXT7C56yz8vSeLXWVvVEp5/m7TcDxbBS5wkY+WHuLDA==", "requires": { "@ethersproject/abi": "^5.5.0", - "@uniswap/sdk-core": "^5.8.0", + "@uniswap/sdk-core": "^6.0.0", "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v2-sdk": "^4.6.0", - "@uniswap/v3-sdk": "^3.17.0", - "@uniswap/v4-sdk": "^1.9.0" + "@uniswap/v2-sdk": "^4.7.0", + "@uniswap/v3-sdk": "^3.19.0", + "@uniswap/v4-sdk": "^1.12.0" } }, "@uniswap/sdk-core": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-5.9.0.tgz", - "integrity": "sha512-OME7WR6+5QwQs45A2079r+/FS0zU944+JCQwUX9GyIriCxqw2pGu4F9IEqmlwD+zSIMml0+MJnJJ47pFgSyWDw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-6.1.1.tgz", + "integrity": "sha512-S9D5NTn7vV+wYwXbKOmYVjJidgmKY6zUsG5KGlQO4fNvcIde1TtVgtMXJl06qv1JeJKbGnzkIAZG4R82lSVZCg==", "requires": { "@ethersproject/address": "^5.0.2", "@ethersproject/bytes": "^5.7.0", @@ -27959,23 +27941,23 @@ } }, "@uniswap/smart-order-router": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.9.2.tgz", - "integrity": "sha512-vAb5x5tGC71GlAgvZj2WczYD/yV0MemJbFmSle/9sokD+qlcgw48hiHaAEzne+bHSHYFfoRr5gsxDeJojsdDug==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.10.0.tgz", + "integrity": "sha512-a9pZKEA5GOAdczB5ba8y381005eNZtDwyGzVPfZM2rvOpEsfLD9/M9olOeI+BxzHYeIrwxjv2sUL47jbg2YqWg==", "requires": { "@eth-optimism/sdk": "^3.2.2", "@types/brotli": "^1.3.4", "@uniswap/default-token-list": "^11.13.0", "@uniswap/permit2-sdk": "^1.3.0", "@uniswap/router-sdk": "^1.14.0", - "@uniswap/sdk-core": "^5.9.0", + "@uniswap/sdk-core": "^6.1.1", "@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.6.1", + "@uniswap/universal-router-sdk": "^4.8.0", "@uniswap/v2-sdk": "^4.6.1", "@uniswap/v3-sdk": "^3.17.1", - "@uniswap/v4-sdk": "^1.10.0", + "@uniswap/v4-sdk": "^1.12.3", "async-retry": "^1.3.1", "await-timeout": "^1.1.1", "axios": "^0.21.1", @@ -28046,20 +28028,20 @@ } }, "@uniswap/universal-router-sdk": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.6.1.tgz", - "integrity": "sha512-HfPYd8xz3/Sjb8if/wAPFOzj0+m7173PVLy+VzF4HrbBwDreU0amYHwf4zQBjffXmys2QtOdwfu7BfZrUwx0kQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-4.8.0.tgz", + "integrity": "sha512-lpk+j5i7ZSpOP/WIJR8x6A6Hvj/6SMyNVbrI5xNRqz00iCOUqEXRF07QCKMwgvB2IccZGz3u88UVm/KUVLGpJw==", "requires": { "@openzeppelin/contracts": "4.7.0", "@uniswap/permit2-sdk": "^1.3.0", - "@uniswap/router-sdk": "^1.14.2", - "@uniswap/sdk-core": "^5.8.2", + "@uniswap/router-sdk": "^1.15.0", + "@uniswap/sdk-core": "^6.1.1", "@uniswap/universal-router": "2.0.0-beta.2", "@uniswap/v2-core": "^1.0.1", - "@uniswap/v2-sdk": "^4.6.0", + "@uniswap/v2-sdk": "^4.7.0", "@uniswap/v3-core": "1.0.0", - "@uniswap/v3-sdk": "^3.18.1", - "@uniswap/v4-sdk": "^1.10.0", + "@uniswap/v3-sdk": "^3.19.0", + "@uniswap/v4-sdk": "^1.12.3", "bignumber.js": "^9.0.2", "ethers": "^5.7.0" }, @@ -28094,13 +28076,13 @@ "integrity": "sha512-MtybtkUPSyysqLY2U210NBDeCHX+ltHt3oADGdjqoThZaFRDKwM6k1Nb3F0A3hk5hwuQvytFWhrWHOEq6nVJ8Q==" }, "@uniswap/v2-sdk": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.6.1.tgz", - "integrity": "sha512-oTJGBPecrNSPMEp4ujDYzyWPNgZ/kS1VR6MGotnjjGsvQ1btm55AO1OR2KoX85bEs7uUSDyQ/r/0p22+g2fgJA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-4.7.0.tgz", + "integrity": "sha512-CShitWRbydaigNF5GfNNCgGH9GXKMI/HD6ThI4T7FoSZkf2pgTXlX1fQ829xbl1ohKO61n4NjZs/HzGKIV5yjQ==", "requires": { "@ethersproject/address": "^5.0.2", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.8.1", + "@uniswap/sdk-core": "^6.0.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" } @@ -28130,13 +28112,13 @@ } }, "@uniswap/v3-sdk": { - "version": "3.18.1", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.18.1.tgz", - "integrity": "sha512-TGrKLToSWwfx6VV2d7fh4kwQMlgspXTLE49ep5zfYODVVqV6WhrRdbteHb3e0bjdjxGSj0gzoLmhsjmoJTE1/g==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.19.0.tgz", + "integrity": "sha512-HbX3YjHJRXI2LFCxLUWgPfRZX6N9a+cELJ3Dus5vYDPYYjFOwJr16c2esDsdHUe3TG2oOeA/u2wv9TDT2GSBIw==", "requires": { "@ethersproject/abi": "^5.5.0", "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.8.1", + "@uniswap/sdk-core": "^6.0.0", "@uniswap/swap-router-contracts": "^1.3.0", "@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-staker": "1.0.0", @@ -28155,32 +28137,15 @@ } }, "@uniswap/v4-sdk": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.11.2.tgz", - "integrity": "sha512-vrAHv13J7LdAsqBkYEkaChc9D3tY9vsEd0YbUwLraC6AUCYGxb2sCEyg+tse5RDicDd0aqiEwyq8OHnCI1R3aQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/@uniswap/v4-sdk/-/v4-sdk-1.12.3.tgz", + "integrity": "sha512-m1SALxCrkG8uY5mZ50XMBjALEh1diFD+MfwAYcEARAH6kwVNZZk2MAEOq3QUm2YqHWmjcfQZPnvMmV3f0iHgZg==", "requires": { "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.3.1", - "@uniswap/v3-sdk": "3.12.0", + "@uniswap/sdk-core": "^6.0.0", + "@uniswap/v3-sdk": "3.19.0", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" - }, - "dependencies": { - "@uniswap/v3-sdk": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/@uniswap/v3-sdk/-/v3-sdk-3.12.0.tgz", - "integrity": "sha512-mUCg9HLKl20h6W8+QtELqN/uaO47/KDSf+EOht+W3C6jt2eGuzSANqS2CY7i8MsAsnZ+MjPhmN+JTOIvf7azfA==", - "requires": { - "@ethersproject/abi": "^5.5.0", - "@ethersproject/solidity": "^5.0.9", - "@uniswap/sdk-core": "^5.0.0", - "@uniswap/swap-router-contracts": "^1.3.0", - "@uniswap/v3-periphery": "^1.1.1", - "@uniswap/v3-staker": "1.0.0", - "tiny-invariant": "^1.1.0", - "tiny-warning": "^1.0.3" - } - } } }, "@yarnpkg/lockfile": { diff --git a/package.json b/package.json index c875693815..e1f9209550 100644 --- 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.14.0", - "@uniswap/sdk-core": "^5.9.0", - "@uniswap/smart-order-router": "4.9.2", + "@uniswap/sdk-core": "^6.1.1", + "@uniswap/smart-order-router": "4.10.0", "@uniswap/token-lists": "^1.0.0-beta.33", - "@uniswap/universal-router-sdk": "^4.6.1", + "@uniswap/universal-router-sdk": "^4.8.0", "@uniswap/v2-sdk": "^4.6.1", "@uniswap/v3-periphery": "^1.4.4", "@uniswap/v3-sdk": "^3.17.1", - "@uniswap/v4-sdk": "^1.11.2", + "@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 index 3e3aaf476d..061e4de663 100644 --- a/test/mocha/e2e/quote.test.ts +++ b/test/mocha/e2e/quote.test.ts @@ -2830,7 +2830,9 @@ describe('quote', function () { [ChainId.BLAST]: () => USDB_BLAST, [ChainId.ZKSYNC]: () => USDC_ON(ChainId.ZKSYNC), [ChainId.WORLDCHAIN]: () => USDC_ON(ChainId.WORLDCHAIN), - [ChainId.ASTROCHAIN_SEPOLIA]: () => USDC_ON(ChainId.ASTROCHAIN_SEPOLIA), + [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 } = { @@ -2860,7 +2862,9 @@ describe('quote', function () { [ChainId.BLAST]: () => WNATIVE_ON(ChainId.BLAST), [ChainId.ZKSYNC]: () => WNATIVE_ON(ChainId.ZKSYNC), [ChainId.WORLDCHAIN]: () => WLD_WORLDCHAIN, - [ChainId.ASTROCHAIN_SEPOLIA]: () => WNATIVE_ON(ChainId.ASTROCHAIN_SEPOLIA), + [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. @@ -2878,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]() @@ -2900,7 +2906,7 @@ describe('quote', function () { // Current WETH/USDB pool (https://blastscan.io/address/0xf52b4b69123cbcf07798ae8265642793b2e8990c) has low WETH amount const amount = - chain === ChainId.BLAST || chain === ChainId.WORLDCHAIN || chain === ChainId.ASTROCHAIN_SEPOLIA + chain === ChainId.BLAST || chain === ChainId.WORLDCHAIN || chain === ChainId.UNICHAIN_SEPOLIA ? type === 'exactOut' ? '0.002' : '0.01' @@ -2988,7 +2994,7 @@ describe('quote', function () { // Current WETH/USDB pool (https://blastscan.io/address/0xf52b4b69123cbcf07798ae8265642793b2e8990c) has low WETH amount const amount = - type === 'exactOut' && (chain === ChainId.BLAST || chain === ChainId.ASTROCHAIN_SEPOLIA) ? '0.002' : '1' + type === 'exactOut' && (chain === ChainId.BLAST || chain === ChainId.UNICHAIN_SEPOLIA) ? '0.002' : '1' const quoteReq: QuoteQueryParams = { tokenInAddress: erc1.address, @@ -3034,7 +3040,7 @@ describe('quote', function () { chain === ChainId.BLAST || chain === ChainId.ZORA || chain === ChainId.ZKSYNC || - chain === ChainId.ASTROCHAIN_SEPOLIA + chain === ChainId.UNICHAIN_SEPOLIA ) { // Blast doesn't have DAI or USDC yet // Zora doesn't have DAI @@ -3127,7 +3133,7 @@ describe('quote', function () { // Current WETH/USDB pool (https://blastscan.io/address/0xf52b4b69123cbcf07798ae8265642793b2e8990c) has low WETH amount const amount = - type === 'exactOut' && (chain === ChainId.BLAST || chain === ChainId.ASTROCHAIN_SEPOLIA) ? '0.002' : '1' + type === 'exactOut' && (chain === ChainId.BLAST || chain === ChainId.UNICHAIN_SEPOLIA) ? '0.002' : '1' const quoteReq: QuoteQueryParams = { tokenInAddress: erc1.address, diff --git a/test/utils/tokens.ts b/test/utils/tokens.ts index 36fc7a32b6..b8a606da88 100644 --- a/test/utils/tokens.ts +++ b/test/utils/tokens.ts @@ -15,7 +15,7 @@ import { log, NodeJSCache, USDC_ARBITRUM, - USDC_ASTROCHAIN_SEPOLIA, + USDC_UNICHAIN_SEPOLIA, USDC_AVAX, USDC_BASE, USDC_BASE_GOERLI, @@ -142,8 +142,8 @@ export const USDC_ON = (chainId: ChainId): Token => { return USDCE_ZKSYNC case ChainId.WORLDCHAIN: return USDC_WORLDCHAIN - case ChainId.ASTROCHAIN_SEPOLIA: - return USDC_ASTROCHAIN_SEPOLIA + case ChainId.UNICHAIN_SEPOLIA: + return USDC_UNICHAIN_SEPOLIA default: throw new Error(`Chain id: ${chainId} not supported`) }