diff --git a/api/_cache.ts b/api/_cache.ts index 6f40d8d11..2380cbc62 100644 --- a/api/_cache.ts +++ b/api/_cache.ts @@ -1,22 +1,37 @@ -import { kv } from "@vercel/kv"; +import { createClient, VercelKV } from "@vercel/kv"; import { interfaces } from "@across-protocol/sdk"; const { KV_REST_API_READ_ONLY_TOKEN, KV_REST_API_TOKEN, KV_REST_API_URL, - KV_URL, + UPSTASH_REDIS_REST_URL, + UPSTASH_REDIS_REST_TOKEN, + UPSTASH_REDIS_READ_ONLY_TOKEN, } = process.env; const isRedisCacheEnabled = - KV_REST_API_URL && KV_REST_API_TOKEN && KV_REST_API_READ_ONLY_TOKEN && KV_URL; + (KV_REST_API_URL && (KV_REST_API_TOKEN || KV_REST_API_READ_ONLY_TOKEN)) || + (UPSTASH_REDIS_REST_URL && + (UPSTASH_REDIS_REST_TOKEN || UPSTASH_REDIS_READ_ONLY_TOKEN)); export class RedisCache implements interfaces.CachingMechanismInterface { + private client: VercelKV | undefined; + + constructor() { + this.client = isRedisCacheEnabled + ? createClient({ + url: UPSTASH_REDIS_REST_URL || KV_REST_API_URL, + token: UPSTASH_REDIS_REST_TOKEN || KV_REST_API_TOKEN, + }) + : undefined; + } + async get(key: string): Promise { - if (!isRedisCacheEnabled) { + if (!this.client) { return null; } - const value = await kv.get(key); + const value = await this.client.get(key); if (value === null || value === undefined) { return null; } @@ -24,7 +39,7 @@ export class RedisCache implements interfaces.CachingMechanismInterface { } async set(key: string, value: T, ttl = 10): Promise { - if (!isRedisCacheEnabled) { + if (!this.client) { return; } @@ -37,7 +52,7 @@ export class RedisCache implements interfaces.CachingMechanismInterface { // Do nothing } } - await kv.set(key, value, { + await this.client.set(key, value, { ex: ttl === Number.POSITIVE_INFINITY ? 60 : ttl, }); return key; diff --git a/api/_errors.ts b/api/_errors.ts index 68dafb965..b48ac2651 100644 --- a/api/_errors.ts +++ b/api/_errors.ts @@ -265,6 +265,7 @@ export function handleErrorCondition( const logLevel = acrossApiError.status >= 500 ? "error" : "warn"; logger[logLevel]({ at: endpoint, + code: acrossApiError.code, message: `Status ${acrossApiError.status} - ${acrossApiError.message}`, }); diff --git a/api/_utils.ts b/api/_utils.ts index 985128dc2..208eab704 100644 --- a/api/_utils.ts +++ b/api/_utils.ts @@ -1905,7 +1905,10 @@ export function getCachedFillGasUsage( ); const { nativeGasCost } = await relayerFeeCalculatorQueries.getGasCosts( buildDepositForSimulation(deposit), - overrides?.relayerAddress + overrides?.relayerAddress, + undefined, + undefined, + true ); return nativeGasCost; }; diff --git a/api/limits.ts b/api/limits.ts index 6dec48231..2714d9d2b 100644 --- a/api/limits.ts +++ b/api/limits.ts @@ -385,9 +385,9 @@ const handler = async ( message: "Response data", responseJson, }); - // Respond with a 200 status code and 15 seconds of cache with + // Respond with a 200 status code and 10 seconds of cache with // 45 seconds of stale-while-revalidate. - sendResponse(response, responseJson, 200, 15, 45); + sendResponse(response, responseJson, 200, 10, 45); } catch (error: unknown) { return handleErrorCondition("limits", response, logger, error); } diff --git a/api/suggested-fees.ts b/api/suggested-fees.ts index 280ac2965..ceb724057 100644 --- a/api/suggested-fees.ts +++ b/api/suggested-fees.ts @@ -333,7 +333,11 @@ const handler = async ( responseJson, }); - response.setHeader("Cache-Control", "s-maxage=10"); + // Only cache response if exclusivity is not set. This prevents race conditions where + // cached exclusivity data is returned for multiple deposits. + if (exclusiveRelayer === sdk.constants.ZERO_ADDRESS) { + response.setHeader("Cache-Control", "s-maxage=10"); + } response.status(200).json(responseJson); } catch (error) { return handleErrorCondition("suggested-fees", response, logger, error); diff --git a/package.json b/package.json index 302d60c3c..0a314ad7d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@across-protocol/constants": "^3.1.16", "@across-protocol/contracts": "^3.0.11", "@across-protocol/contracts-v3.0.6": "npm:@across-protocol/contracts@3.0.6", - "@across-protocol/sdk": "^3.2.8", + "@across-protocol/sdk": "^3.2.9", "@amplitude/analytics-browser": "^2.3.5", "@balancer-labs/sdk": "1.1.6-beta.16", "@emotion/react": "^11.13.0", @@ -26,7 +26,7 @@ "@uniswap/sdk-core": "^4.2.0", "@uniswap/v3-sdk": "^3.11.0", "@vercel/kv": "^2.0.0", - "@web3-onboard/coinbase": "^2.2.5", + "@web3-onboard/coinbase": "^2.4.1", "@web3-onboard/core": "^2.21.2", "@web3-onboard/gnosis": "^2.2.0", "@web3-onboard/injected-wallets": "^2.11.1", @@ -78,6 +78,7 @@ "generate:routes": "tsx scripts/generate-routes.ts", "generate:routes:e2e": "tsx scripts/generate-e2e-test-routes.ts", "generate:routes:mainnet": "yarn generate:routes 1", + "generate:routes:testnet": "yarn generate:routes 11155111", "generate:chain-config": "tsx scripts/generate-chain-config.ts", "generate:ui-assets": "tsx scripts/generate-ui-assets.ts" }, diff --git a/scripts/chain-configs/optimism-sepolia/index.ts b/scripts/chain-configs/optimism-sepolia/index.ts index 955c15262..6e957f105 100644 --- a/scripts/chain-configs/optimism-sepolia/index.ts +++ b/scripts/chain-configs/optimism-sepolia/index.ts @@ -17,7 +17,7 @@ export default { }, chainId, publicRpcUrl: "https://sepolia.optimism.io", - tokens: [], + tokens: ["ETH", "WETH", "USDC"], enableCCTP: false, swapTokens: [], } as ChainConfig; diff --git a/scripts/chain-configs/scroll/index.ts b/scripts/chain-configs/scroll/index.ts index a983473c0..d7fdbb5e6 100644 --- a/scripts/chain-configs/scroll/index.ts +++ b/scripts/chain-configs/scroll/index.ts @@ -18,7 +18,7 @@ export default { chainId, publicRpcUrl: "https://rpc.scroll.io", blockTimeSeconds: 3, - tokens: ["WETH", "ETH", "USDC", "USDT", "WBTC"], + tokens: ["WETH", "ETH", "USDC", "USDT", "WBTC", "POOL"], enableCCTP: false, swapTokens: [], } as ChainConfig; diff --git a/scripts/generate-routes.ts b/scripts/generate-routes.ts index 11e007705..bed614c6d 100644 --- a/scripts/generate-routes.ts +++ b/scripts/generate-routes.ts @@ -4,9 +4,20 @@ import { utils as sdkUtils } from "@across-protocol/sdk"; import { utils } from "ethers"; import { writeFileSync } from "fs"; import * as prettier from "prettier"; - +import path from "path"; import * as chainConfigs from "./chain-configs"; +function getTokenSymbolForLogo(tokenSymbol: string): string { + switch (tokenSymbol) { + case "USDC.e": + case "USDbC": + case "USDzC": + return "USDC"; + default: + return tokenSymbol; + } +} + function getDeployedAddress(contractName: string, chainId: number): string { return sdkUtils.getDeployedAddress(contractName, chainId, true) as string; } @@ -60,12 +71,7 @@ const enabledRoutes = { "0x9040e41eF5E8b281535a96D9a48aCb8cfaBD9a48", merkleDistributorAddress: "0xE50b2cEAC4f60E840Ae513924033E753e2366487", claimAndStakeAddress: "0x985e8A89Dd6Af8896Ef075c8dd93512433dc5829", - pools: [ - { - tokenSymbol: "BOBA", - isNative: false, - }, - ], + pools: [], spokePoolVerifier: { address: "0xB4A8d45647445EA9FC3E1058096142390683dBC2", enabledChains: [ @@ -405,7 +411,7 @@ async function generateRoutes(hubPoolChainId = 1) { symbol: tokenSymbol, name: tokenInfo.name, decimals: tokenInfo.decimals, - logoUrl: `${assetsBaseUrl}/src/assets/token-logos/${tokenSymbol.toLowerCase()}.svg`, + logoUrl: `${assetsBaseUrl}/src/assets/token-logos/${getTokenSymbolForLogo(tokenSymbol).toLowerCase()}.svg`, }; }; return { @@ -413,7 +419,7 @@ async function generateRoutes(hubPoolChainId = 1) { name: chainConfig.name, publicRpcUrl: chainConfig.publicRpcUrl, explorerUrl: chainConfig.blockExplorer, - logoUrl: `${assetsBaseUrl}/scripts/chain-configs/${chainKey.toLowerCase()}/assets/logo.svg`, + logoUrl: `${assetsBaseUrl}${path.resolve("/scripts/chain-configs/", chainKey.toLowerCase().replace("_", "-"), chainConfig.logoPath)}`, spokePool: chainConfig.spokePool.address, spokePoolBlock: chainConfig.spokePool.blockNumber, inputTokens: routeFileContent.routes diff --git a/src/components/Wallet/Web3Subscribe.tsx b/src/components/Wallet/Web3Subscribe.tsx index 70f928f6c..1ccd34dae 100644 --- a/src/components/Wallet/Web3Subscribe.tsx +++ b/src/components/Wallet/Web3Subscribe.tsx @@ -19,7 +19,12 @@ const Web3Subscribe = () => { // Check if CBWallet is available useEffect(() => { - setIsCBWallet(wallet?.label === "Coinbase Wallet"); + const cbExtensionEnabled = + (window as any)?.coinbaseWalletExtension?.connectionType === + "extension_connection_type"; + + const cbWalletSelected = wallet?.label === "Coinbase Wallet"; + setIsCBWallet(cbExtensionEnabled && cbWalletSelected); }, [wallet]); useEffect(() => { diff --git a/src/data/chains_1.json b/src/data/chains_1.json index f72918475..38fd8c1b3 100644 --- a/src/data/chains_1.json +++ b/src/data/chains_1.json @@ -294,7 +294,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x68f180fcCe6836688e9084f035309E29Bf0A2095", @@ -454,7 +454,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6", @@ -614,7 +614,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", @@ -672,7 +672,7 @@ "name": "zkSync", "publicRpcUrl": "https://mainnet.era.zksync.io", "explorerUrl": "https://era.zksync.network", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/zk_sync/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/zk-sync/assets/logo.svg", "spokePool": "0xE0B015E54d54fc84a6cB9B666099c46adE9335FF", "spokePoolBlock": 10352565, "inputTokens": [ @@ -695,7 +695,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0xBBeB516fb02a01611cBBE0453Fe3c580D7281011", @@ -739,7 +739,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0xBBeB516fb02a01611cBBE0453Fe3c580D7281011", @@ -843,7 +843,7 @@ "symbol": "USDbC", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdbc.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb", @@ -896,7 +896,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0xA219439258ca9da29E9Cc4cE5596924745e12B93", @@ -940,7 +940,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x3aAB2285ddcDdaD8edf438C1bAB47e1a9D05a9b4", @@ -993,7 +993,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0xf0F161fDA2712DB8b566946122a5af183995e2eD", @@ -1030,7 +1030,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0xcDd475325D6F564d27247D1DddBb0DAc6fA0a5CF", @@ -1229,6 +1229,13 @@ "name": "Wrapped Bitcoin", "decimals": 8, "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/wbtc.svg" + }, + { + "address": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "symbol": "POOL", + "name": "PoolTogether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/pool.svg" } ], "outputTokens": [ @@ -1266,6 +1273,13 @@ "name": "Tether USD", "decimals": 6, "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdt.svg" + }, + { + "address": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "symbol": "POOL", + "name": "PoolTogether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/pool.svg" } ] }, @@ -1338,7 +1352,7 @@ "symbol": "USDzC", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdzc.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" } ], "outputTokens": [ @@ -1361,7 +1375,7 @@ "symbol": "USDzC", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdzc.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" } ] }, @@ -1370,7 +1384,7 @@ "name": "World Chain", "publicRpcUrl": "https://worldchain-mainnet.g.alchemy.com/public", "explorerUrl": "https://worldchain-mainnet-explorer.alchemy.com", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/world_chain/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/world-chain/assets/logo.svg", "spokePool": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", "spokePoolBlock": 4524742, "inputTokens": [ @@ -1400,7 +1414,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" } ], "outputTokens": [ @@ -1423,7 +1437,7 @@ "symbol": "USDC.e", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.e.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" }, { "address": "0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3", diff --git a/src/data/chains_11155111.json b/src/data/chains_11155111.json index 79ae8794b..d4302785d 100644 --- a/src/data/chains_11155111.json +++ b/src/data/chains_11155111.json @@ -4,7 +4,7 @@ "name": "Sepolia", "publicRpcUrl": "https://gateway.tenderly.co/public/sepolia", "explorerUrl": "https://sepolia.etherscan.io", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/mainnet/assets/logo.svg", "spokePool": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662", "spokePoolBlock": 5288470, "inputTokens": [ @@ -59,7 +59,7 @@ "name": "Base Sepolia", "publicRpcUrl": "https://sepolia.base.org", "explorerUrl": "https://sepolia.basescan.org", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/base_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/base/assets/logo.svg", "spokePool": "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F", "spokePoolBlock": 6082004, "inputTokens": [ @@ -112,7 +112,7 @@ "symbol": "USDbC", "name": "USD Coin (bridged)", "decimals": 6, - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdbc.svg" + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" } ] }, @@ -121,7 +121,7 @@ "name": "Arbitrum Sepolia", "publicRpcUrl": "https://sepolia-rollup.arbitrum.io/rpc", "explorerUrl": "https://sepolia.arbiscan.io", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/arbitrum_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/arbitrum/assets/logo.svg", "spokePool": "0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75", "spokePoolBlock": 12411026, "inputTokens": [ @@ -176,18 +176,62 @@ "name": "Optimism Sepolia", "publicRpcUrl": "https://sepolia.optimism.io", "explorerUrl": "https://sepolia-optimism.etherscan.io", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/optimism_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/optimism/assets/logo.svg", "spokePool": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", "spokePoolBlock": 7762656, - "inputTokens": [], - "outputTokens": [] + "inputTokens": [ + { + "address": "0x4200000000000000000000000000000000000006", + "symbol": "ETH", + "name": "Ether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/eth.svg" + }, + { + "address": "0x4200000000000000000000000000000000000006", + "symbol": "WETH", + "name": "Wrapped Ether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/weth.svg" + }, + { + "address": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "symbol": "USDC", + "name": "USD Coin", + "decimals": 6, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" + } + ], + "outputTokens": [ + { + "address": "0x4200000000000000000000000000000000000006", + "symbol": "WETH", + "name": "Wrapped Ether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/weth.svg" + }, + { + "address": "0x4200000000000000000000000000000000000006", + "symbol": "ETH", + "name": "Ether", + "decimals": 18, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/eth.svg" + }, + { + "address": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "symbol": "USDC", + "name": "USD Coin", + "decimals": 6, + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/src/assets/token-logos/usdc.svg" + } + ] }, { "chainId": 919, "name": "Mode Sepolia", "publicRpcUrl": "https://sepolia.mode.network", "explorerUrl": "https://sepolia.explorer.mode.network", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/mode_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/mode/assets/logo.svg", "spokePool": "0xbd886FC0725Cc459b55BbFEb3E4278610331f83b", "spokePoolBlock": 13999465, "inputTokens": [ @@ -228,7 +272,7 @@ "name": "Polygon Amoy", "publicRpcUrl": "https://rpc-amoy.polygon.technology", "explorerUrl": "https://amoy.polygonscan.com", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/polygon_amoy/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/polygon/assets/logo.svg", "spokePool": "0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5", "spokePoolBlock": 7529960, "inputTokens": [ @@ -262,7 +306,7 @@ "name": "Blast Sepolia", "publicRpcUrl": "https://sepolia.blast.io", "explorerUrl": "https://sepolia.blastscan.io", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/blast_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/blast/assets/logo.svg", "spokePool": "0x5545092553Cf5Bf786e87a87192E902D50D8f022", "spokePoolBlock": 7634204, "inputTokens": [ @@ -303,7 +347,7 @@ "name": "Lisk Sepolia", "publicRpcUrl": "https://rpc.sepolia-api.lisk.com", "explorerUrl": "https://sepolia-blockscout.lisk.com", - "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/lisk_sepolia/assets/logo.svg", + "logoUrl": "https://raw.githubusercontent.com/across-protocol/frontend/master/scripts/chain-configs/lisk/assets/logo.svg", "spokePool": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", "spokePoolBlock": 7267988, "inputTokens": [ diff --git a/src/data/routes_11155111_0x14224e63716afAcE30C9a417E0542281869f7d9e.json b/src/data/routes_11155111_0x14224e63716afAcE30C9a417E0542281869f7d9e.json index 916976b28..2bf848111 100644 --- a/src/data/routes_11155111_0x14224e63716afAcE30C9a417E0542281869f7d9e.json +++ b/src/data/routes_11155111_0x14224e63716afAcE30C9a417E0542281869f7d9e.json @@ -91,6 +91,39 @@ "isNative": false, "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" }, + { + "fromChain": 11155111, + "toChain": 11155420, + "fromTokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155111, + "toChain": 11155420, + "fromTokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155111, + "toChain": 11155420, + "fromTokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238", + "toTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "fromSpokeAddress": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, { "fromChain": 11155111, "toChain": 919, @@ -245,6 +278,39 @@ "isNative": false, "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" }, + { + "fromChain": 84532, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 84532, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 84532, + "toChain": 11155420, + "fromTokenAddress": "0x036CbD53842c5426634e7929541eC2318f3dCF7e", + "toTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "fromSpokeAddress": "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, { "fromChain": 84532, "toChain": 919, @@ -410,6 +476,39 @@ "isNative": false, "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" }, + { + "fromChain": 421614, + "toChain": 11155420, + "fromTokenAddress": "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 421614, + "toChain": 11155420, + "fromTokenAddress": "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 421614, + "toChain": 11155420, + "fromTokenAddress": "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d", + "toTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "fromSpokeAddress": "0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, { "fromChain": 421614, "toChain": 919, @@ -498,6 +597,204 @@ "isNative": true, "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" }, + { + "fromChain": 11155420, + "toChain": 11155111, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 11155111, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 11155111, + "fromTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "toTokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, + { + "fromChain": 11155420, + "toChain": 84532, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 84532, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 84532, + "fromTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "toTokenAddress": "0x036CbD53842c5426634e7929541eC2318f3dCF7e", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, + { + "fromChain": 11155420, + "toChain": 84532, + "fromTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "toTokenAddress": "0xE634Ec56B73779eCFfa78109a653FA0aE33D243f", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDbC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, + { + "fromChain": 11155420, + "toChain": 421614, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 421614, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 421614, + "fromTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "toTokenAddress": "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, + { + "fromChain": 11155420, + "toChain": 919, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 919, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 80002, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x52eF3d68BaB452a294342DC3e5f464d7f610f72E", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 80002, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x52eF3d68BaB452a294342DC3e5f464d7f610f72E", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 168587773, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000023", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 168587773, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000023", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 4202, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 11155420, + "toChain": 4202, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x4e8E101924eDE233C13e2D8622DC8aED2872d505", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, { "fromChain": 919, "toChain": 11155111, @@ -564,6 +861,28 @@ "isNative": true, "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" }, + { + "fromChain": 919, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0xbd886FC0725Cc459b55BbFEb3E4278610331f83b", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 919, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0xbd886FC0725Cc459b55BbFEb3E4278610331f83b", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, { "fromChain": 919, "toChain": 80002, @@ -663,6 +982,17 @@ "isNative": false, "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" }, + { + "fromChain": 80002, + "toChain": 11155420, + "fromTokenAddress": "0x52eF3d68BaB452a294342DC3e5f464d7f610f72E", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, { "fromChain": 80002, "toChain": 919, @@ -762,6 +1092,28 @@ "isNative": true, "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" }, + { + "fromChain": 168587773, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000023", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x5545092553Cf5Bf786e87a87192E902D50D8f022", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 168587773, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000023", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0x5545092553Cf5Bf786e87a87192E902D50D8f022", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, { "fromChain": 168587773, "toChain": 919, @@ -894,6 +1246,28 @@ "isNative": true, "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" }, + { + "fromChain": 4202, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", + "fromTokenSymbol": "WETH", + "toTokenSymbol": "WETH", + "isNative": false, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, + { + "fromChain": 4202, + "toChain": 11155420, + "fromTokenAddress": "0x4200000000000000000000000000000000000006", + "toTokenAddress": "0x4200000000000000000000000000000000000006", + "fromSpokeAddress": "0xeF684C38F94F48775959ECf2012D7E864ffb9dd4", + "fromTokenSymbol": "ETH", + "toTokenSymbol": "ETH", + "isNative": true, + "l1TokenAddress": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14" + }, { "fromChain": 4202, "toChain": 919, @@ -989,6 +1363,20 @@ "swapTokenAddress": "0xE634Ec56B73779eCFfa78109a653FA0aE33D243f", "swapTokenSymbol": "USDbC", "swapTokenL1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" + }, + { + "fromChain": 84532, + "toChain": 11155420, + "fromTokenAddress": "0x036CbD53842c5426634e7929541eC2318f3dCF7e", + "toTokenAddress": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", + "fromSpokeAddress": "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F", + "fromTokenSymbol": "USDC", + "toTokenSymbol": "USDC", + "isNative": false, + "l1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238", + "swapTokenAddress": "0xE634Ec56B73779eCFfa78109a653FA0aE33D243f", + "swapTokenSymbol": "USDbC", + "swapTokenL1TokenAddress": "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238" } ], "pools": [], diff --git a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json index 1c39dd204..d758c3b02 100644 --- a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json +++ b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json @@ -802,6 +802,17 @@ "isNative": false, "l1TokenAddress": "0xdAC17F958D2ee523a2206206994597C13D831ec7" }, + { + "fromChain": 1, + "toChain": 534352, + "fromTokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e", + "toTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "fromSpokeAddress": "0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 1, "toChain": 690, @@ -1660,6 +1671,17 @@ "isNative": false, "l1TokenAddress": "0xdAC17F958D2ee523a2206206994597C13D831ec7" }, + { + "fromChain": 10, + "toChain": 534352, + "fromTokenAddress": "0x395Ae52bB17aef68C2888d941736A71dC6d4e125", + "toTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "fromSpokeAddress": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 10, "toChain": 690, @@ -2397,6 +2419,17 @@ "isNative": false, "l1TokenAddress": "0xdAC17F958D2ee523a2206206994597C13D831ec7" }, + { + "fromChain": 137, + "toChain": 534352, + "fromTokenAddress": "0x25788a1a171ec66Da6502f9975a15B609fF54CF6", + "toTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "fromSpokeAddress": "0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 137, "toChain": 690, @@ -3211,6 +3244,17 @@ "isNative": false, "l1TokenAddress": "0xdAC17F958D2ee523a2206206994597C13D831ec7" }, + { + "fromChain": 42161, + "toChain": 534352, + "fromTokenAddress": "0xCF934E2402A5e072928a39a956964eb8F2B5B79C", + "toTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "fromSpokeAddress": "0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 42161, "toChain": 690, @@ -4520,6 +4564,17 @@ "isNative": true, "l1TokenAddress": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2" }, + { + "fromChain": 8453, + "toChain": 534352, + "fromTokenAddress": "0xd652C5425aea2Afd5fb142e120FeCf79e18fafc3", + "toTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 8453, "toChain": 690, @@ -6841,6 +6896,17 @@ "isNative": false, "l1TokenAddress": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599" }, + { + "fromChain": 534352, + "toChain": 1, + "fromTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "toTokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e", + "fromSpokeAddress": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 534352, "toChain": 10, @@ -6907,6 +6973,17 @@ "isNative": false, "l1TokenAddress": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599" }, + { + "fromChain": 534352, + "toChain": 10, + "fromTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "toTokenAddress": "0x395Ae52bB17aef68C2888d941736A71dC6d4e125", + "fromSpokeAddress": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 534352, "toChain": 137, @@ -6973,6 +7050,17 @@ "isNative": false, "l1TokenAddress": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599" }, + { + "fromChain": 534352, + "toChain": 137, + "fromTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "toTokenAddress": "0x25788a1a171ec66Da6502f9975a15B609fF54CF6", + "fromSpokeAddress": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 534352, "toChain": 42161, @@ -7039,6 +7127,17 @@ "isNative": false, "l1TokenAddress": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599" }, + { + "fromChain": 534352, + "toChain": 42161, + "fromTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "toTokenAddress": "0xCF934E2402A5e072928a39a956964eb8F2B5B79C", + "fromSpokeAddress": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 534352, "toChain": 324, @@ -7138,6 +7237,17 @@ "isNative": false, "l1TokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48" }, + { + "fromChain": 534352, + "toChain": 8453, + "fromTokenAddress": "0xF9Af83FC41e0cc2af2fba93644D542Df6eA0F2b7", + "toTokenAddress": "0xd652C5425aea2Afd5fb142e120FeCf79e18fafc3", + "fromSpokeAddress": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", + "fromTokenSymbol": "POOL", + "toTokenSymbol": "POOL", + "isNative": false, + "l1TokenAddress": "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e" + }, { "fromChain": 534352, "toChain": 59144, @@ -9409,12 +9519,7 @@ "swapTokenL1TokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48" } ], - "pools": [ - { - "tokenSymbol": "BOBA", - "isNative": false - } - ], + "pools": [], "spokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "enabledChains": [ diff --git a/src/hooks/useBalance.ts b/src/hooks/useBalance.ts index b55eb5534..2b23480a0 100644 --- a/src/hooks/useBalance.ts +++ b/src/hooks/useBalance.ts @@ -8,8 +8,10 @@ import { getConfig, ConfigClient, getChainInfo, + TOKEN_SYMBOLS_MAP, } from "utils"; import { BigNumber, providers } from "ethers"; +import { utils } from "@across-protocol/sdk"; const config = getConfig(); @@ -178,12 +180,18 @@ export function useBalanceBySymbolPerChain({ queryKey: balanceQueryKey(account, chainId, tokenSymbol), queryFn: ({ queryKey }) => { const [, chainIdToQuery, tokenSymbolToQuery, accountToQuery] = queryKey; + if ( + tokenSymbolToQuery === TOKEN_SYMBOLS_MAP.ETH.symbol && + utils.getNativeTokenSymbol(chainIdToQuery!) !== + TOKEN_SYMBOLS_MAP.ETH.symbol + ) { + return Promise.resolve(BigNumber.from(0)); + } return getBalanceBySymbol({ config, chainIdToQuery, tokenSymbolToQuery, accountToQuery, - provider: undefined, }); }, enabled: Boolean(account && tokenSymbol), diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 9623c6b89..a64848742 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -123,6 +123,7 @@ export const rewardPrograms: Record = { ChainId.MODE, ChainId.BASE, ChainId.WORLD_CHAIN, + ChainId.LISK, ], }, "arb-rebates": { diff --git a/src/utils/onboard.ts b/src/utils/onboard.ts index f24ce5184..33ca8900b 100644 --- a/src/utils/onboard.ts +++ b/src/utils/onboard.ts @@ -18,7 +18,9 @@ const walletConnect = walletConnectModule({ projectId: walletConnectProjectId, version: 2, }); -const coinbase = coinbaseModule(); +const coinbase = coinbaseModule({ + supportedWalletType: "all", +}); export function onboardInit() { return init({ diff --git a/src/views/Bridge/components/ChainSelector.tsx b/src/views/Bridge/components/ChainSelector.tsx index 3602aba79..a81a676a7 100644 --- a/src/views/Bridge/components/ChainSelector.tsx +++ b/src/views/Bridge/components/ChainSelector.tsx @@ -9,8 +9,8 @@ import { capitalizeFirstLetter, formatUnitsWithMaxFractions, getChainInfo, + getToken, shortenAddress, - tokenList, } from "utils"; import { getAllChains } from "../utils"; @@ -34,12 +34,10 @@ export function ChainSelector({ onSelectChain, }: Props) { const isFrom = fromOrTo === "from"; - const { fromChain, toChain, fromTokenSymbol, toTokenSymbol } = selectedRoute; const selectedChain = getChainInfo(isFrom ? fromChain : toChain); - const tokenInfo = tokenList.filter( - (t) => t.symbol === (isFrom ? fromTokenSymbol : toTokenSymbol) - )[0]; + + const tokenInfo = getToken(isFrom ? fromTokenSymbol : toTokenSymbol); const { account, isConnected } = useConnection(); const { balances } = useBalanceBySymbolPerChain({ @@ -54,7 +52,7 @@ export function ChainSelector({ balance: balances?.[c.chainId] ?? BigNumber.from(0), disabled: false, })); - if (!balances || !isConnected) { + if (!balances || !isConnected || !isFrom) { return chains; } else { return chains @@ -76,18 +74,19 @@ export function ChainSelector({ } }); } - }, [balances, isConnected]); + }, [balances, isConnected, isFrom]); return ( elements={sortOrder.map((chain) => ({ value: chain.chainId, element: , - suffix: isConnected ? ( - - {formatUnitsWithMaxFractions(chain.balance, tokenInfo.decimals)} - - ) : undefined, + suffix: + isConnected && isFrom ? ( + + {formatUnitsWithMaxFractions(chain.balance, tokenInfo.decimals)} + + ) : undefined, }))} displayElement={ isFrom ? ( diff --git a/yarn.lock b/yarn.lock index a2bec6edf..02b5fac47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -75,10 +75,10 @@ axios "^1.7.4" zksync-web3 "^0.14.3" -"@across-protocol/sdk@^3.2.8": - version "3.2.8" - resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-3.2.8.tgz#1486b05f5a8548012db99a5b76ce9e30ed7b516b" - integrity sha512-MAhMGQMpuc0qB8U9MMV3EY/u9TQZdGzKY9xDSKCtbXKrY2Qdj0dUHEjHGbxex2lrG4UnI8ha7i8qEIp7gHCOOQ== +"@across-protocol/sdk@^3.2.9": + version "3.2.9" + resolved "https://registry.yarnpkg.com/@across-protocol/sdk/-/sdk-3.2.9.tgz#7a390889572c033f1dc8db96234bb41b0b2f5090" + integrity sha512-EdSZDLGxHyKmKhLNFpMqUr3rty910VV4nJ1nZfKAMH0HGg8l4tDjFReGYu7cQTyeSSwc04ngmjbvErQPb91k9g== dependencies: "@across-protocol/across-token" "^1.0.0" "@across-protocol/constants" "^3.1.16" @@ -1308,7 +1308,7 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4": version "7.24.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.6.tgz#5b76eb89ad45e2e4a0a8db54c456251469a3358e" integrity sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw== @@ -1387,28 +1387,17 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@coinbase/wallet-sdk@^3.7.1": - version "3.7.2" - resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.2.tgz#7a89bd9e3a06a1f26d4480d8642af33fb0c7e3aa" - integrity sha512-lIGvXMsgpsQWci/XOMQIJ2nIZ8JUy/L+bvC0wkRaYarr0YylwpXrJ2gRM3hCXPS477pkyO7N/kSiAoRgEXUdJQ== +"@coinbase/wallet-sdk@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-4.0.3.tgz#fd52dd4c168c35979c7b3294018a6f78d163a593" + integrity sha512-y/OGEjlvosikjfB+wk+4CVb9OxD1ob9cidEBLI5h8Hxaf/Qoob2XoVT1uvhtAzBx34KpGYSd+alKvh/GCRre4Q== dependencies: - "@metamask/safe-event-emitter" "2.0.0" - "@solana/web3.js" "^1.70.1" - bind-decorator "^1.0.11" - bn.js "^5.1.1" buffer "^6.0.3" - clsx "^1.1.0" - eth-block-tracker "6.1.0" - eth-json-rpc-filters "5.1.0" - eth-rpc-errors "4.0.2" - json-rpc-engine "6.1.0" - keccak "^3.0.1" - preact "^10.5.9" - qs "^6.10.3" - rxjs "^6.6.3" + clsx "^1.2.1" + eventemitter3 "^5.0.1" + keccak "^3.0.3" + preact "^10.16.0" sha.js "^2.4.11" - stream-browserify "^3.0.0" - util "^0.12.4" "@colors/colors@1.5.0": version "1.5.0" @@ -3724,21 +3713,6 @@ tweetnacl "^1.0.3" tweetnacl-util "^0.15.1" -"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" - integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== - -"@metamask/utils@^3.0.1": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-3.6.0.tgz#b218b969a05ca7a8093b5d1670f6625061de707d" - integrity sha512-9cIRrfkWvHblSiNDVXsjivqa9Ak0RYo/1H6tqTqTbAx+oBK2Sva0lWDHxGchOqA7bySGUJKAWSNJvH6gdHZ0gQ== - dependencies: - "@types/debug" "^4.1.7" - debug "^4.3.4" - semver "^7.3.8" - superstruct "^1.0.3" - "@motionone/animation@^10.15.1": version "10.15.1" resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" @@ -3829,7 +3803,7 @@ dependencies: "@noble/hashes" "1.3.2" -"@noble/curves@1.3.0", "@noble/curves@^1.0.0", "@noble/curves@~1.3.0": +"@noble/curves@1.3.0", "@noble/curves@~1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.3.0.tgz#01be46da4fd195822dab821e72f71bf4aeec635e" integrity sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA== @@ -3851,7 +3825,7 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699" integrity sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA== -"@noble/hashes@^1.3.0", "@noble/hashes@^1.4.0": +"@noble/hashes@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426" integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg== @@ -5202,34 +5176,6 @@ lodash.union "^4.6.0" lodash.values "^4.3.0" -"@solana/buffer-layout@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.0.tgz#75b1b11adc487234821c81dfae3119b73a5fd734" - integrity sha512-lR0EMP2HC3+Mxwd4YcnZb0smnaDw7Bl2IQWZiTevRH5ZZBZn6VRWn3/92E3qdU4SSImJkA6IDHawOHAnx/qUvQ== - dependencies: - buffer "~6.0.3" - -"@solana/web3.js@^1.70.1": - version "1.77.3" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.77.3.tgz#2cbeaa1dd24f8fa386ac924115be82354dfbebab" - integrity sha512-PHaO0BdoiQRPpieC1p31wJsBaxwIOWLh8j2ocXNKX8boCQVldt26Jqm2tZE4KlrvnCIV78owPLv1pEUgqhxZ3w== - dependencies: - "@babel/runtime" "^7.12.5" - "@noble/curves" "^1.0.0" - "@noble/hashes" "^1.3.0" - "@solana/buffer-layout" "^4.0.0" - agentkeepalive "^4.2.1" - bigint-buffer "^1.1.5" - bn.js "^5.0.0" - borsh "^0.7.0" - bs58 "^4.0.1" - buffer "6.0.3" - fast-stable-stringify "^1.0.0" - jayson "^4.1.0" - node-fetch "^2.6.7" - rpc-websockets "^7.5.1" - superstruct "^0.14.2" - "@solidity-parser/parser@^0.14.0": version "0.14.5" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" @@ -6625,7 +6571,7 @@ dependencies: "@types/node" "*" -"@types/connect@*", "@types/connect@^3.4.33": +"@types/connect@*": version "3.4.37" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.37.tgz#c66a96689fd3127c8772eb3e9e5c6028ec1a9af5" integrity sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q== @@ -6639,7 +6585,7 @@ dependencies: "@types/node" "*" -"@types/debug@^4.1.5", "@types/debug@^4.1.7": +"@types/debug@^4.1.5": version "4.1.8" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== @@ -6938,7 +6884,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== -"@types/node@^12.0.0", "@types/node@^12.12.54", "@types/node@^12.12.6": +"@types/node@^12.0.0", "@types/node@^12.12.6": version "12.20.55" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== @@ -7143,13 +7089,6 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.0.tgz#ed6ecaa8e5ed5dfe8b2b3d00181702c9925f13fb" integrity sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg== -"@types/ws@^7.4.4": - version "7.4.7" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" - integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww== - dependencies: - "@types/node" "*" - "@types/ws@^8.5.5": version "8.5.5" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" @@ -7980,13 +7919,13 @@ "@walletconnect/window-getters" "^1.0.1" tslib "1.14.1" -"@web3-onboard/coinbase@^2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@web3-onboard/coinbase/-/coinbase-2.2.5.tgz#fb7a57e5456323c0ee107ce48ea0cc80acbb6e07" - integrity sha512-mEiaK+K+nB2TwxUpkyAZmb4AHguymsJrHFbsZDdAolFTgZizCSjGHBhYlCEfxLL4fh3CpUryTa/AaNxxhdG6OQ== +"@web3-onboard/coinbase@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@web3-onboard/coinbase/-/coinbase-2.4.1.tgz#164d839ba5d08cc9dcc0147de6586a40e3125205" + integrity sha512-o5KdsN2hmD1GHAkT5qJORZo0I5AOl0lHMXzyrb7AHsFQpMeeYmGcpAkzOJXUWpuZUf3UPNfo7RHmKzxOlj2t5g== dependencies: - "@coinbase/wallet-sdk" "^3.7.1" - "@web3-onboard/common" "^2.3.3" + "@coinbase/wallet-sdk" "4.0.3" + "@web3-onboard/common" "^2.4.1" "@web3-onboard/common@^2.3.3", "@web3-onboard/common@^2.4.1": version "2.4.2" @@ -8168,14 +8107,6 @@ resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -8319,15 +8250,6 @@ agent-base@^7.0.2: dependencies: debug "^4.3.4" -agentkeepalive@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" - integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== - dependencies: - debug "^4.1.0" - depd "^2.0.0" - humanize-ms "^1.2.1" - aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -8815,13 +8737,6 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async-mutex@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.2.6.tgz#0d7a3deb978bc2b984d5908a2038e1ae2e54ff40" - integrity sha512-Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw== - dependencies: - tslib "^2.0.0" - async-mutex@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.5.0.tgz#353c69a0b9e75250971a64ac203b0ebfddd75482" @@ -9729,13 +9644,6 @@ big.js@^6.0.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f" integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ== -bigint-buffer@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/bigint-buffer/-/bigint-buffer-1.1.5.tgz#d038f31c8e4534c1f8d0015209bf34b4fa6dd442" - integrity sha512-trfYco6AoZ+rKhKnxA0hgX0HAbVP/s808/EuDSe2JDzUnCp/xAsli35Orvk67UrTEcwuxZqYZDmfA2RXJgxVvA== - dependencies: - bindings "^1.3.0" - bignumber.js@*, bignumber.js@^9.0.0, bignumber.js@^9.0.1, bignumber.js@^9.0.2: version "9.1.2" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" @@ -9769,12 +9677,7 @@ binary@~0.3.0: buffers "~0.1.1" chainsaw "~0.1.0" -bind-decorator@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/bind-decorator/-/bind-decorator-1.0.11.tgz#e41bc06a1f65dd9cec476c91c5daf3978488252f" - integrity sha1-5BvAah9l3ZzsR2yRxdrzl4SIJS8= - -bindings@^1.3.0, bindings@^1.5.0: +bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== @@ -9839,7 +9742,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0, bn.js@^5.2.1: +bn.js@^5.0.0, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0, bn.js@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -9890,15 +9793,6 @@ borc@^2.1.2: json-text-sequence "~0.1.0" readable-stream "^3.6.0" -borsh@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.7.0.tgz#6e9560d719d86d90dc589bca60ffc8a6c51fec2a" - integrity sha512-CLCsZGIBCFnPtkNnieW/a8wmreDmfUtjU2m9yHrzPXIlNbqVs0AQrSatSG6vdNYUqdc83tkQi2eHfF98ubzQLA== - dependencies: - bn.js "^5.2.0" - bs58 "^4.0.0" - text-encoding-utf-8 "^1.0.2" - bowser@^2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f" @@ -10173,7 +10067,7 @@ buffer-xor@^1.0.3: resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== -buffer@6.0.3, buffer@^6.0.1, buffer@^6.0.3, buffer@~6.0.3: +buffer@6.0.3, buffer@^6.0.1, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -10910,7 +10804,7 @@ clone@^2.0.0, clone@^2.1.1: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== -clsx@^1.1.0: +clsx@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== @@ -11028,7 +10922,7 @@ commander@^10.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== -commander@^2.11.0, commander@^2.15.0, commander@^2.19.0, commander@^2.20.3: +commander@^2.11.0, commander@^2.15.0, commander@^2.19.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -11699,11 +11593,6 @@ del@^6.0.0: rimraf "^3.0.2" slash "^3.0.0" -delay@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d" - integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw== - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -11714,7 +11603,7 @@ delimit-stream@0.1.0: resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b" integrity sha512-a02fiQ7poS5CnjiJBAsjGLPp5EwVoGHNeu9sziBd9huppRfsAFIpv5zNLv0V1gbop53ilngAf5Kf331AwcoRBQ== -depd@2.0.0, depd@^2.0.0: +depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -12364,18 +12253,11 @@ es6-iterator@^2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-promise@4.2.8, es6-promise@^4.0.3, es6-promise@^4.2.8: +es6-promise@4.2.8, es6-promise@^4.2.8: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== -es6-promisify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" - integrity sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ== - dependencies: - es6-promise "^4.0.3" - es6-symbol@^3.1.1, es6-symbol@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c" @@ -12922,16 +12804,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -eth-block-tracker@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-6.1.0.tgz#0481f97bbb88a100b9d45806fe7e37af741cbefc" - integrity sha512-K9SY8+/xMBi4M5HHTDdxnpEqEEGjbNpzHFqvxyjMZej8InV/B+CkFRKM6W+uvrFJ7m8Zd1E0qUkseU3vdIDFYQ== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - "@metamask/utils" "^3.0.1" - json-rpc-random-id "^1.0.1" - pify "^3.0.0" - eth-block-tracker@^4.4.2: version "4.4.3" resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626" @@ -12998,17 +12870,6 @@ eth-json-rpc-errors@^2.0.2: dependencies: fast-safe-stringify "^2.0.6" -eth-json-rpc-filters@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-5.1.0.tgz#f0c2aeaec2a45e2dc6ca1b9843d8e85447821427" - integrity sha512-fos+9xmoa1A2Ytsc9eYof17r81BjdJOUcGcgZn4K/tKdCCTb+a8ytEtwlu1op5qsXFDlgGmstTELFrDEc89qEQ== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - async-mutex "^0.2.6" - eth-query "^2.1.2" - json-rpc-engine "^6.1.0" - pify "^5.0.0" - eth-lib@0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.8.tgz#b194058bef4b220ad12ea497431d6cb6aa0623c8" @@ -13038,13 +12899,6 @@ eth-query@^2.1.0, eth-query@^2.1.2: json-rpc-random-id "^1.0.0" xtend "^4.0.1" -eth-rpc-errors@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7" - integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ== - dependencies: - fast-safe-stringify "^2.0.6" - eth-rpc-errors@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10" @@ -13052,13 +12906,6 @@ eth-rpc-errors@^3.0.0: dependencies: fast-safe-stringify "^2.0.6" -eth-rpc-errors@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a" - integrity sha512-Z3ymjopaoft7JDoxZcEb3pwdGh7yiYMhOwm2doUt6ASXlMavpNlK6Cre0+IMl2VSGyEU9rkiperQhp5iRxn5Pg== - dependencies: - fast-safe-stringify "^2.0.6" - eth-sig-util@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-3.0.1.tgz#8753297c83a3f58346bd13547b59c4b2cd110c96" @@ -13392,6 +13239,11 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.7: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + eventid@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/eventid/-/eventid-2.0.1.tgz#574e860149457a79a2efe788c459f0c3062d02ec" @@ -13614,11 +13466,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== -eyes@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ== - fake-merkle-patricia-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz#4b8c3acfb520afadf9860b1f14cd8ce3402cddd3" @@ -13674,11 +13521,6 @@ fast-safe-stringify@^2.0.6: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fast-stable-stringify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313" - integrity sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag== - fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3: version "1.0.6" resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" @@ -15300,13 +15142,6 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - husky@^8.0.0: version "8.0.1" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9" @@ -15409,7 +15244,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -16259,11 +16094,6 @@ isomorphic-ws@5.0.0: resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw== -isomorphic-ws@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" - integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== - isows@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.3.tgz#93c1cf0575daf56e7120bab5c8c448b0809d0d74" @@ -16438,24 +16268,6 @@ jake@^10.8.5: filelist "^1.0.4" minimatch "^3.1.2" -jayson@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/jayson/-/jayson-4.1.0.tgz#60dc946a85197317f2b1439d672a8b0a99cea2f9" - integrity sha512-R6JlbyLN53Mjku329XoRT2zJAE6ZgOQ8f91ucYdMCD4nkGCF9kZSrcGXpHIU4jeKj58zUZke2p+cdQchU7Ly7A== - dependencies: - "@types/connect" "^3.4.33" - "@types/node" "^12.12.54" - "@types/ws" "^7.4.4" - JSONStream "^1.3.5" - commander "^2.20.3" - delay "^5.0.0" - es6-promisify "^5.0.0" - eyes "^0.1.8" - isomorphic-ws "^4.0.1" - json-stringify-safe "^5.0.1" - uuid "^8.3.2" - ws "^7.4.5" - jest-changed-files@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e" @@ -17080,14 +16892,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-rpc-engine@6.1.0, json-rpc-engine@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-6.1.0.tgz#bf5ff7d029e1c1bf20cb6c0e9f348dcd8be5a393" - integrity sha512-NEdLrtrq1jUZyfjkr9OCz9EzCNhnRyWtt1PAnvnhwy6e8XETS0Dtc+ZNCO2gvuAoKsIn2+vCSowXTYE4CkgnAQ== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - eth-rpc-errors "^4.0.2" - json-rpc-engine@^5.1.3: version "5.4.0" resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5" @@ -17144,7 +16948,7 @@ json-stable-stringify@^1.0.1: jsonify "^0.0.1" object-keys "^1.1.1" -json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: +json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== @@ -17206,11 +17010,6 @@ jsonify@^0.0.1: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== - jsonschema@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" @@ -17253,7 +17052,7 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" -keccak@^3.0.0, keccak@^3.0.1, keccak@^3.0.2: +keccak@^3.0.0, keccak@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== @@ -17262,6 +17061,15 @@ keccak@^3.0.0, keccak@^3.0.1, keccak@^3.0.2: node-gyp-build "^4.2.0" readable-stream "^3.6.0" +keccak@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" + integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keypair@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/keypair/-/keypair-1.0.4.tgz#a749a45f388593f3950f18b3757d32a93bd8ce83" @@ -18477,7 +18285,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -19675,11 +19483,6 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" - integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== - pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -19882,10 +19685,10 @@ preact@10.4.1: resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431" integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q== -preact@^10.5.9: - version "10.6.4" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.6.4.tgz#ad12c409ff1b4316158486e0a7b8d43636f7ced8" - integrity sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ== +preact@^10.16.0: + version "10.24.3" + resolved "https://registry.yarnpkg.com/preact/-/preact-10.24.3.tgz#086386bd47071e3b45410ef20844c21e23828f64" + integrity sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA== precond@0.2: version "0.2.3" @@ -20286,7 +20089,7 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" -qs@^6.10.0, qs@^6.10.3, qs@^6.4.0, qs@^6.9.4: +qs@^6.10.0, qs@^6.4.0, qs@^6.9.4: version "6.12.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a" integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ== @@ -20669,7 +20472,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.2.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: +readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -21301,19 +21104,6 @@ rollup@^4.0.2: "@rollup/rollup-win32-x64-msvc" "4.18.0" fsevents "~2.3.2" -rpc-websockets@^7.5.1: - version "7.5.1" - resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.1.tgz#e0a05d525a97e7efc31a0617f093a13a2e10c401" - integrity sha512-kGFkeTsmd37pHPMaHIgN1LVKXMi0JD782v4Ds9ZKtLlwdTKjn+CxM9A9/gLT2LaOuEcEFGL98h1QWQtlOIdW0w== - dependencies: - "@babel/runtime" "^7.17.2" - eventemitter3 "^4.0.7" - uuid "^8.3.2" - ws "^8.5.0" - optionalDependencies: - bufferutil "^4.0.1" - utf-8-validate "^5.0.2" - run-async@^2.4.0, run-async@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -22190,14 +21980,6 @@ storybook@^7.5.3: dependencies: "@storybook/cli" "7.5.3" -stream-browserify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" - integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== - dependencies: - inherits "~2.0.4" - readable-stream "^3.5.0" - stream-buffers@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521" @@ -22524,21 +22306,11 @@ superjson@^1.10.0: dependencies: copy-anything "^3.0.2" -superstruct@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b" - integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ== - superstruct@^0.15.4: version "0.15.4" resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.4.tgz#e3381dd84ca07e704e19f69eda74eee1a5efb1f9" integrity sha512-eOoMeSbP9ZJChNOm/9RYjE+F36rYR966AAqeG3xhQB02j2sfAUXDp4EQ/7bAOqnlJnuFDB8yvOu50SocvKpUEw== -superstruct@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-1.0.3.tgz#de626a5b49c6641ff4d37da3c7598e7a87697046" - integrity sha512-8iTn3oSS8nRGn+C2pgXSKPI3jmpm6FExNazNpjvqS6ZUJQCej3PUXEKM8NjHBOs54ExM+LPW/FBRhymrdcCiSg== - supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0: version "8.1.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" @@ -22785,11 +22557,6 @@ testrpc@0.0.1: resolved "https://registry.yarnpkg.com/testrpc/-/testrpc-0.0.1.tgz#83e2195b1f5873aec7be1af8cbe6dcf39edb7aed" integrity sha512-afH1hO+SQ/VPlmaLUFj2636QMeDvPCeQMc/9RBMW0IfjNe9gFD9Ra3ShqYkB7py0do1ZcCna/9acHyzTJ+GcNA== -text-encoding-utf-8@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" - integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg== - text-hex@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" @@ -22846,7 +22613,7 @@ through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -"through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8: +through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== @@ -25220,12 +24987,12 @@ ws@^6.1.0: dependencies: async-limiter "~1.0.0" -ws@^7.4.5, ws@^7.4.6, ws@^7.5.1: +ws@^7.4.6, ws@^7.5.1: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^8.11.0, ws@^8.13.0, ws@^8.2.3, ws@^8.5.0: +ws@^8.11.0, ws@^8.13.0, ws@^8.2.3: version "8.17.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==