From 8e4773e9f01d687caf2c0e7badb76edabb2a86cf Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Mon, 17 Jul 2023 15:13:23 +0100 Subject: [PATCH 01/56] fix: Original error recording (#3713) * chore: Ensure all BalActionStep errors are marked as fatal * chore: Improve original error parsing --- .../_global/BalActionSteps/BalActionSteps.vue | 6 +++++- src/lib/utils/errors.ts | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/_global/BalActionSteps/BalActionSteps.vue b/src/components/_global/BalActionSteps/BalActionSteps.vue index 9ec25e6c4d..77b505878b 100644 --- a/src/components/_global/BalActionSteps/BalActionSteps.vue +++ b/src/components/_global/BalActionSteps/BalActionSteps.vue @@ -208,7 +208,11 @@ async function submit( state.init = false; state.confirming = false; state.error = formatErrorMsg(error); - captureBalancerException({ error, action: props.primaryActionType }); + captureBalancerException({ + error, + action: props.primaryActionType, + context: { level: 'fatal' }, + }); } } diff --git a/src/lib/utils/errors.ts b/src/lib/utils/errors.ts index fcd535ea24..34a7d4c99e 100644 --- a/src/lib/utils/errors.ts +++ b/src/lib/utils/errors.ts @@ -35,17 +35,18 @@ function _captureBalancerException({ const balError = getBalError(error); const message = formatErrorMsgForSentry(error, balError, msgPrefix); - const _error = constructError(message, action, error); const metadata = (error as WalletError).metadata || {}; const tags = getTags(action, context, balError, metadata); + const originalError = getOriginalError(error); + const _error = constructError(message, action, error); captureException(_error, { ...context, extra: { ...context?.extra, ...metadata, balError, - originalError: (error as WalletError).data?.originalError, + originalError, }, tags, }); @@ -87,6 +88,19 @@ function getBalError(error): string | null { return balError && balError[0] ? balError[0].slice(-3) : null; } +/** + * Try to find the original error. + */ +function getOriginalError(error: Error | unknown): Error | undefined { + if ((error as WalletError).data?.originalError) { + return (error as WalletError).data?.originalError as Error; + } else if ((error as Error).cause instanceof Error) { + return (error as Error).cause as Error; + } + + return undefined; +} + /** * Extract tags for Sentry from error. */ From 1fc5d3e993210efd0a4612e1b4e2ac1d79df603b Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 17 Jul 2023 14:13:39 +0000 Subject: [PATCH 02/56] 1.114.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3c07196eea..f5a148de13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.0", + "version": "1.114.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.0", + "version": "1.114.1", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index c2023d5bb7..95ab4b0650 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.0", + "version": "1.114.1", "engines": { "node": "=16", "npm": ">=8" From 88b672a163ca1e258af643617a0d6616dc0286a8 Mon Sep 17 00:00:00 2001 From: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:45:14 -0400 Subject: [PATCH 03/56] Hotfix: idle/usdc whitelist (#3717) --- src/lib/config/mainnet/pools.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index f28bbdd6e9..8775725321 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -157,6 +157,7 @@ const pools: Pools = { '0x3de27efa2f1aa663ae5d458857e731c129069f29000200000000000000000588', // wstETH-AAVE '0xb2b918f2d628b4c8ff237b0a1c6ac3bea222fedc00020000000000000000059c', // gho/ohm '0x7d98f308db99fdd04bbf4217a4be8809f38faa6400020000000000000000059b', // wstETH/ohm + '0x158e0fbc2271e1dcebadd365a22e2b4dd173c0db0002000000000000000005a5', // idle/usdc ], }, Factories: { From 4fdce103821e36f88fb474c1f6520d0e75dcf8a7 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 17 Jul 2023 14:45:33 +0000 Subject: [PATCH 04/56] 1.114.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5a148de13..4fd4b92cdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.1", + "version": "1.114.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.1", + "version": "1.114.2", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 95ab4b0650..35550c2c45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.1", + "version": "1.114.2", "engines": { "node": "=16", "npm": ">=8" From fed60c19a68e5068946b3ba91a0b156eb29e765e Mon Sep 17 00:00:00 2001 From: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:03:22 -0400 Subject: [PATCH 05/56] weekly gauges add (#3722) --- src/data/voting-gauges.json | 1109 ++++++++++++++++++------------ src/lib/config/arbitrum/pools.ts | 5 + src/lib/config/mainnet/pools.ts | 11 + src/lib/config/polygon/pools.ts | 3 + 4 files changed, 704 insertions(+), 424 deletions(-) diff --git a/src/data/voting-gauges.json b/src/data/voting-gauges.json index 75a2747076..46858a1a68 100644 --- a/src/data/voting-gauges.json +++ b/src/data/voting-gauges.json @@ -442,41 +442,6 @@ "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2.png" } }, - { - "address": "0x68d019f64A7aa97e2D4e7363AEE42251D08124Fb", - "network": 1, - "isKilled": true, - "relativeWeightCap": "null", - "addedTimestamp": 1648465429, - "pool": { - "id": "0x7b50775383d3d6f0215a8f290f2c9e2eebbeceb20000000000000000000000fe", - "address": "0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2", - "poolType": "StablePhantom", - "symbol": "bb-a-USD", - "tokens": [ - { - "address": "0x2BBf681cC4eb09218BEe85EA2a5d3D13Fa40fC0C", - "weight": "null", - "symbol": "bb-a-USDT" - }, - { - "address": "0x804CdB9116a10bB78768D3252355a1b18067bF8f", - "weight": "null", - "symbol": "bb-a-DAI" - }, - { - "address": "0x9210F1204b5a24742Eba12f710636D76240dF3d0", - "weight": "null", - "symbol": "bb-a-USDC" - } - ] - }, - "tokenLogoURIs": { - "0x2BBf681cC4eb09218BEe85EA2a5d3D13Fa40fC0C": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x2bbf681cc4eb09218bee85ea2a5d3d13fa40fc0c.png", - "0x804CdB9116a10bB78768D3252355a1b18067bF8f": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x804cdb9116a10bb78768d3252355a1b18067bf8f.png", - "0x9210F1204b5a24742Eba12f710636D76240dF3d0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x9210f1204b5a24742eba12f710636d76240df3d0.png" - } - }, { "address": "0x9AB7B0C7b154f626451c9e8a68dC04f58fb6e5Ce", "network": 1, @@ -589,7 +554,7 @@ ] }, "tokenLogoURIs": { - "0x81f8f0bb1cB2A06649E51913A151F0E7Ef6FA321": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x81f8f0bb1cB2A06649E51913A151F0E7Ef6FA321/logo.png", + "0x81f8f0bb1cB2A06649E51913A151F0E7Ef6FA321": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x81f8f0bb1cb2a06649e51913a151f0e7ef6fa321.png", "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2.png" } }, @@ -709,35 +674,6 @@ "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xdef1ca1fb7fbcdc777520aa7f396b4e015f497ab.png" } }, - { - "address": "0xA6468eca7633246Dcb24E5599681767D27d1F978", - "network": 1, - "isKilled": true, - "relativeWeightCap": "null", - "addedTimestamp": 1650405644, - "pool": { - "id": "0x92762b42a06dcdddc5b7362cfb01e631c4d44b40000200000000000000000182", - "address": "0x92762B42A06dCDDDc5B7362Cfb01E631c4D44B40", - "poolType": "Weighted", - "symbol": "50COW-50GNO", - "tokens": [ - { - "address": "0x6810e776880C02933D47DB1b9fc05908e5386b96", - "weight": "0.5", - "symbol": "GNO" - }, - { - "address": "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB", - "weight": "0.5", - "symbol": "COW" - } - ] - }, - "tokenLogoURIs": { - "0x6810e776880C02933D47DB1b9fc05908e5386b96": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6810e776880C02933D47DB1b9fc05908e5386b96/logo.png", - "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xdef1ca1fb7fbcdc777520aa7f396b4e015f497ab.png" - } - }, { "address": "0x7C777eEA1dC264e71E567Fcc9B6DdaA9064Eff51", "network": 1, @@ -792,7 +728,7 @@ ] }, "tokenLogoURIs": { - "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png", + "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2.png", "0xEd1480d12bE41d92F36f5f7bDd88212E381A3677": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xed1480d12be41d92f36f5f7bdd88212e381a3677.png" } }, @@ -3029,7 +2965,7 @@ { "address": "0x8a88C1f44854C61a466aB55614F6A7778473418b", "network": 1, - "isKilled": false, + "isKilled": true, "relativeWeightCap": "0.1", "addedTimestamp": 1683038387, "pool": { @@ -3520,271 +3456,602 @@ } }, { - "address": "0xf0f572ad66baacDd07d8c7ea3e0E5EFA56a76081", - "network": 5, + "address": "0x9e3f4FB69058244066801404e50889592d33cA11", + "network": 1, "isKilled": false, - "relativeWeightCap": "null", - "addedTimestamp": 1654312702, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, "pool": { - "id": "0x16faf9f73748013155b7bc116a3008b57332d1e600020000000000000000005b", - "address": "0x16faF9f73748013155B7bC116a3008b57332D1e6", - "poolType": "Weighted", - "symbol": "B-50WBTC-50WETH", + "id": "0x4cbde5c4b4b53ebe4af4adb85404725985406163000000000000000000000595", + "address": "0x4CbdE5C4B4B53EBE4aF4adB85404725985406163", + "poolType": "ComposableStable", + "symbol": "B-ETHx/bb-a-WETH ", "tokens": [ { - "address": "0x37f03a12241E9FD3658ad6777d289c3fb8512Bc9", - "weight": "0.5", - "symbol": "WBTC" + "address": "0xA35b1B31Ce002FBF2058D22F30f95D405200A15b", + "weight": "null", + "symbol": "ETHx" }, { - "address": "0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1", - "weight": "0.5", - "symbol": "WETH" + "address": "0xbB6881874825E60e1160416D6C426eae65f2459E", + "weight": "null", + "symbol": "bb-a-WETH" } ] }, "tokenLogoURIs": { - "0x37f03a12241E9FD3658ad6777d289c3fb8512Bc9": "", - "0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1": "" + "0xA35b1B31Ce002FBF2058D22F30f95D405200A15b": "https://assets.coingecko.com/coins/images/30870/large/ETHx-small.png?1688373266", + "0xbB6881874825E60e1160416D6C426eae65f2459E": "" } }, { - "address": "0xDaCD99029b4B94CD04fE364aAc370829621C1C64", - "network": 10, + "address": "0x882f961Def46deadAcf31798B295834a5b6d0c86", + "network": 1, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1683715019, + "addedTimestamp": 1689617291, "pool": { - "id": "0x4fd63966879300cafafbb35d157dc5229278ed2300020000000000000000002b", - "address": "0x4Fd63966879300caFafBB35D157dC5229278Ed23", - "poolType": "MetaStable", - "symbol": "BPT-rETH-ETH", + "id": "0xbf2ef8bdc2fc0f3203b3a01778e3ec5009aeef3300000000000000000000058d", + "address": "0xbF2ef8bDC2fC0F3203B3a01778E3ec5009AEEf33", + "poolType": "ComposableStable", + "symbol": "R-bb-s-DAI-BLP", "tokens": [ { - "address": "0x4200000000000000000000000000000000000006", + "address": "0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21", "weight": "null", - "symbol": "WETH" + "symbol": "R" }, { - "address": "0x9Bcef72be871e61ED4fBbc7630889beE758eb81D", + "address": "0x2B218683178d029BAB6c9789b1073aA6c96E5176", "weight": "null", - "symbol": "rETH" + "symbol": "bb-s-DAI" } ] }, "tokenLogoURIs": { - "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000006/logo.png", - "0x9Bcef72be871e61ED4fBbc7630889beE758eb81D": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x9Bcef72be871e61ED4fBbc7630889beE758eb81D/logo.png" + "0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://assets.coingecko.com/coins/images/29551/large/R_200x200.png?1685954962", + "0x2B218683178d029BAB6c9789b1073aA6c96E5176": "" } }, { - "address": "0x1Ce5bf7e6C16C567DeFd625e0911Bfd0FC7f2d7d", - "network": 10, + "address": "0x70892E4355d0E04A3d19264E93c64C401520f3A4", + "network": 1, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1688412059, + "addedTimestamp": 1689617291, "pool": { - "id": "0x39965c9dab5448482cf7e002f583c812ceb53046000100000000000000000003", - "address": "0x39965c9dAb5448482Cf7e002F583c812Ceb53046", - "poolType": "Weighted", - "symbol": "BPT-ROAD", + "id": "0x3fa8c89704e5d07565444009e5d9e624b40be813000000000000000000000599", + "address": "0x3FA8C89704e5d07565444009e5d9e624B40Be813", + "poolType": "ComposableStable", + "symbol": "GHO/LUSD", "tokens": [ { - "address": "0x4200000000000000000000000000000000000006", - "weight": "0.4", - "symbol": "WETH" - }, - { - "address": "0x4200000000000000000000000000000000000042", - "weight": "0.4", - "symbol": "OP" + "address": "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f", + "weight": "null", + "symbol": "GHO" }, { - "address": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", - "weight": "0.2", - "symbol": "USDC" + "address": "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0", + "weight": "null", + "symbol": "LUSD" } ] }, "tokenLogoURIs": { - "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000006/logo.png", - "0x4200000000000000000000000000000000000042": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000042/logo.png", - "0x7F5c764cBc14f9669B88837ca1490cCa17c31607": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x7F5c764cBc14f9669B88837ca1490cCa17c31607/logo.png" + "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": "https://assets.coingecko.com/coins/images/30663/large/ghoaave.jpeg?1686151372", + "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5f98805a4e8be255a32880fdec7f6728c6568ba0.png" } }, { - "address": "0xd0b6787589d33B4F7aA5a27f36497e091e78a2ad", - "network": 10, + "address": "0x6EE63656BbF5BE3fdF9Be4982BF9466F6a921b83", + "network": 1, "isKilled": false, - "relativeWeightCap": "0.02", - "addedTimestamp": 1688412059, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, "pool": { - "id": "0x1d95129c18a8c91c464111fdf7d0eb241b37a9850002000000000000000000c1", - "address": "0x1D95129c18a8c91C464111FDf7d0Eb241B37a985", + "id": "0x7d98f308db99fdd04bbf4217a4be8809f38faa6400020000000000000000059b", + "address": "0x7D98f308Db99FDD04BbF4217a4be8809F38fAa64", "poolType": "Weighted", - "symbol": "BPT-RESERVE", + "symbol": "80wstETH/20GHO", "tokens": [ { - "address": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", - "weight": "0.5", - "symbol": "USDC" + "address": "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f", + "weight": "0.2", + "symbol": "GHO" }, { - "address": "0xc5b001DC33727F8F26880B184090D3E252470D45", - "weight": "0.5", - "symbol": "ERN" + "address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "weight": "0.8", + "symbol": "wstETH" } ] }, "tokenLogoURIs": { - "0x7F5c764cBc14f9669B88837ca1490cCa17c31607": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x7F5c764cBc14f9669B88837ca1490cCa17c31607/logo.png", - "0xc5b001DC33727F8F26880B184090D3E252470D45": "" + "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": "https://assets.coingecko.com/coins/images/30663/large/ghoaave.jpeg?1686151372", + "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png" } }, { - "address": "0x0BFcF593C149Ddbeedb190667d24D30D2E38AF73", - "network": 10, + "address": "0x73f49a29F91e016CC9BdE5cdF6f5DC049280e5A9", + "network": 1, "isKilled": false, - "relativeWeightCap": "0.02", - "addedTimestamp": 1688412059, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, "pool": { - "id": "0xd20f6f1d8a675cdca155cb07b5dc9042c467153f0002000000000000000000bc", - "address": "0xd20f6F1D8a675cDCa155Cb07b5dC9042c467153f", + "id": "0xb2b918f2d628b4c8ff237b0a1c6ac3bea222fedc00020000000000000000059c", + "address": "0xB2B918f2d628b4c8ff237b0A1c6aC3Bea222FEDc", "poolType": "Weighted", - "symbol": "BPT-BOATH", + "symbol": "50GHO/50OHM", "tokens": [ { - "address": "0x39FdE572a18448F8139b7788099F0a0740f51205", - "weight": "0.8", - "symbol": "OATH" + "address": "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f", + "weight": "0.5", + "symbol": "GHO" }, { - "address": "0x4200000000000000000000000000000000000006", - "weight": "0.2", - "symbol": "WETH" + "address": "0x64aa3364F17a4D01c6f1751Fd97C2BD3D7e7f1D5", + "weight": "0.5", + "symbol": "OHM" } ] }, "tokenLogoURIs": { - "0x39FdE572a18448F8139b7788099F0a0740f51205": "", - "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000006/logo.png" + "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": "https://assets.coingecko.com/coins/images/30663/large/ghoaave.jpeg?1686151372", + "0x64aa3364F17a4D01c6f1751Fd97C2BD3D7e7f1D5": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x64aa3364f17a4d01c6f1751fd97c2bd3d7e7f1d5.png" } }, { - "address": "0xdc08146530DD9910F8ab4D0aD2C184f87e903540", - "network": 10, + "address": "0x5Db1Fe5A1652f095eBc3f6065E9DB3f3d492bfC2", + "network": 1, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1688412059, + "addedTimestamp": 1689617291, "pool": { - "id": "0x098f32d98d0d64dba199fc1923d3bf4192e787190001000000000000000000d2", - "address": "0x098f32D98d0D64Dba199FC1923D3BF4192E78719", - "poolType": "Weighted", - "symbol": "bb-rf-SOTRI", + "id": "0xc2b021133d1b0cf07dba696fd5dd89338428225b000000000000000000000598", + "address": "0xc2B021133D1b0cF07dba696fd5DD89338428225B", + "poolType": "ComposableStable", + "symbol": "GHO/bb-a-USD", "tokens": [ { - "address": "0x6af3737F6d58Ae8Bcb9f2B597125D37244596E59", - "weight": "0.25", - "symbol": "bb-rf-soWBTC" - }, - { - "address": "0x7e9250cC13559eB50536859e8C076Ef53e275Fb3", - "weight": "0.5", - "symbol": "bb-rf-soWSTETH" + "address": "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f", + "weight": "null", + "symbol": "GHO" }, { - "address": "0xEdcfaF390906a8f91fb35B7bAC23f3111dBaEe1C", - "weight": "0.25", - "symbol": "bb-rf-soUSDC" + "address": "0xc443C15033FCB6Cf72cC24f1BDA0Db070DdD9786", + "weight": "null", + "symbol": "bb-a-USD" } ] }, "tokenLogoURIs": { - "0x6af3737F6d58Ae8Bcb9f2B597125D37244596E59": "", - "0x7e9250cC13559eB50536859e8C076Ef53e275Fb3": "", - "0xEdcfaF390906a8f91fb35B7bAC23f3111dBaEe1C": "" + "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": "https://assets.coingecko.com/coins/images/30663/large/ghoaave.jpeg?1686151372", + "0xc443C15033FCB6Cf72cC24f1BDA0Db070DdD9786": "" } }, { - "address": "0x1b8C2C972c67f4A5B43C2EbE07E64fCB88ACee87", - "network": 10, + "address": "0x5c23661E747F84E0c71d782e5f1513126041734B", + "network": 1, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1688412059, + "addedTimestamp": 1689617291, "pool": { - "id": "0x7b50775383d3d6f0215a8f290f2c9e2eebbeceb200020000000000000000008b", - "address": "0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2", - "poolType": "MetaStable", - "symbol": "BPT-WSTETH-WETH", + "id": "0x9a172e1cb0e99f7e6dcc4c52e4655e8f337d5c0000000000000000000000059a", + "address": "0x9A172e1cb0E99f7E6DCc4c52e4655e8f337d5c00", + "poolType": "ComposableStable", + "symbol": "GHO/MAI", "tokens": [ { - "address": "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb", + "address": "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f", "weight": "null", - "symbol": "wstETH" + "symbol": "GHO" }, { - "address": "0x4200000000000000000000000000000000000006", + "address": "0x8D6CeBD76f18E1558D4DB88138e2DeFB3909fAD6", "weight": "null", - "symbol": "WETH" + "symbol": "MAI" } ] }, "tokenLogoURIs": { - "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x1f32b1c2345538c0c6f582fcb022739c4a194ebb.png", - "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000006/logo.png" + "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": "https://assets.coingecko.com/coins/images/30663/large/ghoaave.jpeg?1686151372", + "0x8D6CeBD76f18E1558D4DB88138e2DeFB3909fAD6": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x8d6cebd76f18e1558d4db88138e2defb3909fad6.png" } }, { - "address": "0x21b2Ef3DC22B7bd4634205081c667e39742075E2", - "network": 100, + "address": "0x0021e01B9fAb840567a8291b864fF783894EabC6", + "network": 1, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1682430623, + "addedTimestamp": 1689617291, "pool": { - "id": "0x66f33ae36dd80327744207a48122f874634b3ada000100000000000000000013", - "address": "0x66F33Ae36dD80327744207a48122F874634B3adA", - "poolType": "Weighted", - "symbol": "agUSD-agWETH-agWBTC", + "id": "0x42ed016f826165c2e5976fe5bc3df540c5ad0af700000000000000000000058b", + "address": "0x42ED016F826165C2e5976fe5bC3df540C5aD0Af7", + "poolType": "ComposableStable", + "symbol": "wstETH-rETH-sfrxETH-BPT", "tokens": [ { - "address": "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50", - "weight": "0.333333333", - "symbol": "bb-ag-WETH" + "address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "weight": "null", + "symbol": "wstETH" }, { - "address": "0xd4015683b8153666190e0B2bEC352580EBC4CaCa", - "weight": "0.333333334", - "symbol": "bb-ag-WBTC" + "address": "0xac3E018457B222d93114458476f3E3416Abbe38F", + "weight": "null", + "symbol": "sfrxETH" }, { - "address": "0xFEdb19Ec000d38d92Af4B21436870F115db22725", - "weight": "0.333333333", - "symbol": "bb-ag-USD" + "address": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "weight": "null", + "symbol": "rETH" } ] }, "tokenLogoURIs": { - "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xbb9cd48d33033f5effbedec9dd700c7d7e1dcf50.png", - "0xd4015683b8153666190e0B2bEC352580EBC4CaCa": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xd4015683b8153666190e0b2bec352580ebc4caca.png", - "0xFEdb19Ec000d38d92Af4B21436870F115db22725": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xfedb19ec000d38d92af4b21436870f115db22725.png" + "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png", + "0xac3E018457B222d93114458476f3E3416Abbe38F": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xac3e018457b222d93114458476f3e3416abbe38f.png", + "0xae78736Cd615f374D3085123A210448E74Fc6393": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xae78736cd615f374d3085123a210448e74fc6393.png" } }, { - "address": "0x56A65cC666bfe538c5a031942369F6F63eb42240", - "network": 100, - "isKilled": true, + "address": "0x21eC388000B5BA5D9e3DF3848EA0c1f58e054Af7", + "network": 1, + "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1677684467, + "addedTimestamp": 1689617291, "pool": { - "id": "0x66f33ae36dd80327744207a48122f874634b3ada000100000000000000000013", - "address": "0x66F33Ae36dD80327744207a48122F874634B3adA", - "poolType": "Weighted", - "symbol": "agUSD-agWETH-agWBTC", + "id": "0xc443c15033fcb6cf72cc24f1bda0db070ddd9786000000000000000000000593", + "address": "0xc443C15033FCB6Cf72cC24f1BDA0Db070DdD9786", + "poolType": "ComposableStable", + "symbol": "bb-a-USD", "tokens": [ { - "address": "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50", - "weight": "0.333333333", - "symbol": "bb-ag-WETH" + "address": "0xc50d4347209F285247BDa8A09Fc1C12CE42031c3", + "weight": "null", + "symbol": "bb-a-USDC" + }, + { + "address": "0xcfAE6E251369467F465f13836Ac8135bd42f8A56", + "weight": "null", + "symbol": "bb-a-USDT" + }, + { + "address": "0xfa24A90A3F2bBE5FEEA92B95cD0d14Ce709649f9", + "weight": "null", + "symbol": "bb-a-DAI" + } + ] + }, + "tokenLogoURIs": { + "0xc50d4347209F285247BDa8A09Fc1C12CE42031c3": "", + "0xcfAE6E251369467F465f13836Ac8135bd42f8A56": "", + "0xfa24A90A3F2bBE5FEEA92B95cD0d14Ce709649f9": "" + } + }, + { + "address": "0x29488df9253171AcD0a0598FDdA92C5F6E767a38", + "network": 1, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0x41503c9d499ddbd1dcdf818a1b05e9774203bf46000000000000000000000594", + "address": "0x41503C9D499ddbd1dCdf818a1b05e9774203Bf46", + "poolType": "ComposableStable", + "symbol": "wstETH-bb-a-WETH-BPT", + "tokens": [ + { + "address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "weight": "null", + "symbol": "wstETH" + }, + { + "address": "0xbB6881874825E60e1160416D6C426eae65f2459E", + "weight": "null", + "symbol": "bb-a-WETH" + } + ] + }, + "tokenLogoURIs": { + "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png", + "0xbB6881874825E60e1160416D6C426eae65f2459E": "" + } + }, + { + "address": "0x3eFd3E18504dC213188Ed2b694F886A305a6e5ed", + "network": 1, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0xd7edb56f63b2a0191742aea32df1f98ca81ed9c600000000000000000000058e", + "address": "0xd7edb56F63b2a0191742aEa32DF1F98ca81ed9c6", + "poolType": "ComposableStable", + "symbol": "B-wstETH/bb-ma3-weth", + "tokens": [ + { + "address": "0x3fCb7085B8F2F473F80bF6D879cAe99eA4DE9344", + "weight": "null", + "symbol": "bb-ma3-weth" + }, + { + "address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "weight": "null", + "symbol": "wstETH" + } + ] + }, + "tokenLogoURIs": { + "0x3fCb7085B8F2F473F80bF6D879cAe99eA4DE9344": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x3fcb7085b8f2f473f80bf6d879cae99ea4de9344.png", + "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png" + } + }, + { + "address": "0xf0f572ad66baacDd07d8c7ea3e0E5EFA56a76081", + "network": 5, + "isKilled": false, + "relativeWeightCap": "null", + "addedTimestamp": 1654312702, + "pool": { + "id": "0x16faf9f73748013155b7bc116a3008b57332d1e600020000000000000000005b", + "address": "0x16faF9f73748013155B7bC116a3008b57332D1e6", + "poolType": "Weighted", + "symbol": "B-50WBTC-50WETH", + "tokens": [ + { + "address": "0x37f03a12241E9FD3658ad6777d289c3fb8512Bc9", + "weight": "0.5", + "symbol": "WBTC" + }, + { + "address": "0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1", + "weight": "0.5", + "symbol": "WETH" + } + ] + }, + "tokenLogoURIs": { + "0x37f03a12241E9FD3658ad6777d289c3fb8512Bc9": "", + "0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1": "" + } + }, + { + "address": "0xDaCD99029b4B94CD04fE364aAc370829621C1C64", + "network": 10, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1683715019, + "pool": { + "id": "0x4fd63966879300cafafbb35d157dc5229278ed2300020000000000000000002b", + "address": "0x4Fd63966879300caFafBB35D157dC5229278Ed23", + "poolType": "MetaStable", + "symbol": "BPT-rETH-ETH", + "tokens": [ + { + "address": "0x4200000000000000000000000000000000000006", + "weight": "null", + "symbol": "WETH" + }, + { + "address": "0x9Bcef72be871e61ED4fBbc7630889beE758eb81D", + "weight": "null", + "symbol": "rETH" + } + ] + }, + "tokenLogoURIs": { + "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4200000000000000000000000000000000000006.png", + "0x9Bcef72be871e61ED4fBbc7630889beE758eb81D": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x9Bcef72be871e61ED4fBbc7630889beE758eb81D/logo.png" + } + }, + { + "address": "0x1Ce5bf7e6C16C567DeFd625e0911Bfd0FC7f2d7d", + "network": 10, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1688412059, + "pool": { + "id": "0x39965c9dab5448482cf7e002f583c812ceb53046000100000000000000000003", + "address": "0x39965c9dAb5448482Cf7e002F583c812Ceb53046", + "poolType": "Weighted", + "symbol": "BPT-ROAD", + "tokens": [ + { + "address": "0x4200000000000000000000000000000000000006", + "weight": "0.4", + "symbol": "WETH" + }, + { + "address": "0x4200000000000000000000000000000000000042", + "weight": "0.4", + "symbol": "OP" + }, + { + "address": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", + "weight": "0.2", + "symbol": "USDC" + } + ] + }, + "tokenLogoURIs": { + "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4200000000000000000000000000000000000006.png", + "0x4200000000000000000000000000000000000042": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000042/logo.png", + "0x7F5c764cBc14f9669B88837ca1490cCa17c31607": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x7F5c764cBc14f9669B88837ca1490cCa17c31607/logo.png" + } + }, + { + "address": "0xd0b6787589d33B4F7aA5a27f36497e091e78a2ad", + "network": 10, + "isKilled": false, + "relativeWeightCap": "0.02", + "addedTimestamp": 1688412059, + "pool": { + "id": "0x1d95129c18a8c91c464111fdf7d0eb241b37a9850002000000000000000000c1", + "address": "0x1D95129c18a8c91C464111FDf7d0Eb241B37a985", + "poolType": "Weighted", + "symbol": "BPT-RESERVE", + "tokens": [ + { + "address": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", + "weight": "0.5", + "symbol": "USDC" + }, + { + "address": "0xc5b001DC33727F8F26880B184090D3E252470D45", + "weight": "0.5", + "symbol": "ERN" + } + ] + }, + "tokenLogoURIs": { + "0x7F5c764cBc14f9669B88837ca1490cCa17c31607": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/assets/0x7F5c764cBc14f9669B88837ca1490cCa17c31607/logo.png", + "0xc5b001DC33727F8F26880B184090D3E252470D45": "" + } + }, + { + "address": "0x0BFcF593C149Ddbeedb190667d24D30D2E38AF73", + "network": 10, + "isKilled": false, + "relativeWeightCap": "0.02", + "addedTimestamp": 1688412059, + "pool": { + "id": "0xd20f6f1d8a675cdca155cb07b5dc9042c467153f0002000000000000000000bc", + "address": "0xd20f6F1D8a675cDCa155Cb07b5dC9042c467153f", + "poolType": "Weighted", + "symbol": "BPT-BOATH", + "tokens": [ + { + "address": "0x39FdE572a18448F8139b7788099F0a0740f51205", + "weight": "0.8", + "symbol": "OATH" + }, + { + "address": "0x4200000000000000000000000000000000000006", + "weight": "0.2", + "symbol": "WETH" + } + ] + }, + "tokenLogoURIs": { + "0x39FdE572a18448F8139b7788099F0a0740f51205": "", + "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4200000000000000000000000000000000000006.png" + } + }, + { + "address": "0xdc08146530DD9910F8ab4D0aD2C184f87e903540", + "network": 10, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1688412059, + "pool": { + "id": "0x098f32d98d0d64dba199fc1923d3bf4192e787190001000000000000000000d2", + "address": "0x098f32D98d0D64Dba199FC1923D3BF4192E78719", + "poolType": "Weighted", + "symbol": "bb-rf-SOTRI", + "tokens": [ + { + "address": "0x6af3737F6d58Ae8Bcb9f2B597125D37244596E59", + "weight": "0.25", + "symbol": "bb-rf-soWBTC" + }, + { + "address": "0x7e9250cC13559eB50536859e8C076Ef53e275Fb3", + "weight": "0.5", + "symbol": "bb-rf-soWSTETH" + }, + { + "address": "0xEdcfaF390906a8f91fb35B7bAC23f3111dBaEe1C", + "weight": "0.25", + "symbol": "bb-rf-soUSDC" + } + ] + }, + "tokenLogoURIs": { + "0x6af3737F6d58Ae8Bcb9f2B597125D37244596E59": "", + "0x7e9250cC13559eB50536859e8C076Ef53e275Fb3": "", + "0xEdcfaF390906a8f91fb35B7bAC23f3111dBaEe1C": "" + } + }, + { + "address": "0x1b8C2C972c67f4A5B43C2EbE07E64fCB88ACee87", + "network": 10, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1688412059, + "pool": { + "id": "0x7b50775383d3d6f0215a8f290f2c9e2eebbeceb200020000000000000000008b", + "address": "0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2", + "poolType": "MetaStable", + "symbol": "BPT-WSTETH-WETH", + "tokens": [ + { + "address": "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb", + "weight": "null", + "symbol": "wstETH" + }, + { + "address": "0x4200000000000000000000000000000000000006", + "weight": "null", + "symbol": "WETH" + } + ] + }, + "tokenLogoURIs": { + "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x1f32b1c2345538c0c6f582fcb022739c4a194ebb.png", + "0x4200000000000000000000000000000000000006": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4200000000000000000000000000000000000006.png" + } + }, + { + "address": "0x21b2Ef3DC22B7bd4634205081c667e39742075E2", + "network": 100, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1682430623, + "pool": { + "id": "0x66f33ae36dd80327744207a48122f874634b3ada000100000000000000000013", + "address": "0x66F33Ae36dD80327744207a48122F874634B3adA", + "poolType": "Weighted", + "symbol": "agUSD-agWETH-agWBTC", + "tokens": [ + { + "address": "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50", + "weight": "0.333333333", + "symbol": "bb-ag-WETH" + }, + { + "address": "0xd4015683b8153666190e0B2bEC352580EBC4CaCa", + "weight": "0.333333334", + "symbol": "bb-ag-WBTC" + }, + { + "address": "0xFEdb19Ec000d38d92Af4B21436870F115db22725", + "weight": "0.333333333", + "symbol": "bb-ag-USD" + } + ] + }, + "tokenLogoURIs": { + "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xbb9cd48d33033f5effbedec9dd700c7d7e1dcf50.png", + "0xd4015683b8153666190e0B2bEC352580EBC4CaCa": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xd4015683b8153666190e0b2bec352580ebc4caca.png", + "0xFEdb19Ec000d38d92Af4B21436870F115db22725": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xfedb19ec000d38d92af4b21436870f115db22725.png" + } + }, + { + "address": "0x56A65cC666bfe538c5a031942369F6F63eb42240", + "network": 100, + "isKilled": true, + "relativeWeightCap": "1", + "addedTimestamp": 1677684467, + "pool": { + "id": "0x66f33ae36dd80327744207a48122f874634b3ada000100000000000000000013", + "address": "0x66F33Ae36dD80327744207a48122F874634B3adA", + "poolType": "Weighted", + "symbol": "agUSD-agWETH-agWBTC", + "tokens": [ + { + "address": "0xbb9Cd48d33033F5EfFBeDec9Dd700C7D7E1dCF50", + "weight": "0.333333333", + "symbol": "bb-ag-WETH" }, { "address": "0xd4015683b8153666190e0B2bEC352580EBC4CaCa", @@ -3989,83 +4256,48 @@ "network": 137, "isKilled": true, "relativeWeightCap": "null", - "addedTimestamp": 1650405699, - "pool": { - "id": "0x0297e37f1873d2dab4487aa67cd56b58e2f27875000100000000000000000002", - "address": "0x0297e37f1873D2DAb4487Aa67cD56B58E2F27875", - "poolType": "Weighted", - "symbol": "B-POLYBASE", - "tokens": [ - { - "address": "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270", - "weight": "0.25", - "symbol": "WMATIC" - }, - { - "address": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174", - "weight": "0.25", - "symbol": "USDC" - }, - { - "address": "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619", - "weight": "0.25", - "symbol": "WETH" - }, - { - "address": "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3", - "weight": "0.25", - "symbol": "BAL" - } - ] - }, - "tokenLogoURIs": { - "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270.png", - "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174/logo.png", - "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619/logo.png", - "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3/logo.png" - } - }, - { - "address": "0x1604b7E80975555e0aCEaca9C81807FbB4D65Cf1", - "network": 137, - "isKilled": true, - "relativeWeightCap": "1", - "addedTimestamp": 1683715019, + "addedTimestamp": 1650405699, "pool": { - "id": "0x03cd191f589d12b0582a99808cf19851e468e6b500010000000000000000000a", - "address": "0x03cD191F589d12b0582a99808cf19851E468E6B5", + "id": "0x0297e37f1873d2dab4487aa67cd56b58e2f27875000100000000000000000002", + "address": "0x0297e37f1873D2DAb4487Aa67cD56B58E2F27875", "poolType": "Weighted", - "symbol": "BPTC", + "symbol": "B-POLYBASE", "tokens": [ { - "address": "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6", - "weight": "0.333333333333333333", - "symbol": "WBTC" + "address": "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270", + "weight": "0.25", + "symbol": "WMATIC" }, { "address": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174", - "weight": "0.333333333333333333", + "weight": "0.25", "symbol": "USDC" }, { "address": "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619", - "weight": "0.333333333333333334", + "weight": "0.25", "symbol": "WETH" + }, + { + "address": "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3", + "weight": "0.25", + "symbol": "BAL" } ] }, "tokenLogoURIs": { - "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6": "https://assets.coingecko.com/coins/images/7598/large/wrapped_bitcoin_wbtc.png?1548822744", + "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270.png", "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174/logo.png", - "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619/logo.png" + "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619/logo.png", + "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/assets/0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3/logo.png" } }, { - "address": "0x88D07558470484c03d3bb44c3ECc36CAfCF43253", + "address": "0x1604b7E80975555e0aCEaca9C81807FbB4D65Cf1", "network": 137, "isKilled": true, - "relativeWeightCap": "null", - "addedTimestamp": 1650405699, + "relativeWeightCap": "1", + "addedTimestamp": 1683715019, "pool": { "id": "0x03cd191f589d12b0582a99808cf19851e468e6b500010000000000000000000a", "address": "0x03cD191F589d12b0582a99808cf19851E468E6B5", @@ -5042,212 +5274,90 @@ } }, { - "address": "0x54f220a891f468629027C3Cc8A58722D4F576402", - "network": 1101, - "isKilled": false, - "relativeWeightCap": "1", - "addedTimestamp": 1687258571, - "pool": { - "id": "0x1d0a8a31cdb04efac3153237526fb15cc65a252000000000000000000000000f", - "address": "0x1d0A8a31CDb04efAC3153237526Fb15cc65A2520", - "poolType": "ComposableStable", - "symbol": "B-rETH-STABLE", - "tokens": [ - { - "address": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9", - "weight": "null", - "symbol": "WETH" - }, - { - "address": "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942", - "weight": "null", - "symbol": "rETH" - } - ] - }, - "tokenLogoURIs": { - "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4f9a0e7fd2bf6067db6994cf12e4495df938e6e9.png", - "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xb23c20efce6e24acca0cef9b7b7aa196b84ec942.png" - } - }, - { - "address": "0xce99399fb4De36056A6831b159572E271360ea40", - "network": 1101, + "address": "0x6f06b425e1bc11FC486C308c22e503d188525F06", + "network": 137, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1687258571, + "addedTimestamp": 1689617291, "pool": { - "id": "0xe1f2c039a68a216de6dd427be6c60decf405762a00000000000000000000000e", - "address": "0xe1F2c039a68A216dE6DD427Be6c60dEcf405762A", + "id": "0xb266ac3b7c98d7bcb28731dac0ef42dba1b276be000000000000000000000be4", + "address": "0xb266aC3b7C98D7Bcb28731Dac0eF42DbA1b276bE", "poolType": "ComposableStable", - "symbol": "B-wstETH-STABLE", + "symbol": "truMATIC-bb-a-WMATIC-BPT", "tokens": [ { - "address": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9", + "address": "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488", "weight": "null", - "symbol": "WETH" + "symbol": "bb-a-WMATIC" }, { - "address": "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9", + "address": "0xC1381c17d29A22dF5c3015C3D83ebd90AbD0e6b3", "weight": "null", - "symbol": "wstETH" + "symbol": "fxTruMATIC" } ] }, "tokenLogoURIs": { - "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x4f9a0e7fd2bf6067db6994cf12e4495df938e6e9.png", - "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5d8cff95d7a57c0bf50b30b43c7cc0d52825d4a9.png" + "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488": "", + "0xC1381c17d29A22dF5c3015C3D83ebd90AbD0e6b3": "" } }, { - "address": "0x48799A2B0b9ec11E4fa158c781AD8bFAbB892D58", - "network": 1101, + "address": "0x24E8787B4AC5325Fd082BC30b9fe7eb2F01304c7", + "network": 137, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1687258571, + "addedTimestamp": 1689617291, "pool": { - "id": "0xe274c9deb6ed34cfe4130f8d0a8a948dea5bb28600000000000000000000000d", - "address": "0xe274c9deb6ed34cfe4130F8D0A8a948deA5bB286", + "id": "0xac2cae8d2f78a4a8f92f20dbe74042cd0a8d5af3000000000000000000000be2", + "address": "0xAC2CaE8D2f78A4a8F92f20dbe74042Cd0a8d5Af3", "poolType": "ComposableStable", - "symbol": "bb-o-USD", + "symbol": "stMATIC-bb-a-WMATIC-BPT", "tokens": [ { - "address": "0x16C9a4D841E88E52b51936106010F27085a529EC", + "address": "0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4", "weight": "null", - "symbol": "bb-o-USDC" + "symbol": "stMATIC" }, { - "address": "0x4B718E0E2fEA1dA68b763CD50C446FbA03CEB2Ea", + "address": "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488", "weight": "null", - "symbol": "bb-o-USDT" + "symbol": "bb-a-WMATIC" } ] }, "tokenLogoURIs": { - "0x16C9a4D841E88E52b51936106010F27085a529EC": "", - "0x4B718E0E2fEA1dA68b763CD50C446FbA03CEB2Ea": "" + "0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4.png", + "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488": "" } }, { - "address": "0xF7d515DC47d5BD57786494628ed766d6bF31cd39", - "network": 1101, + "address": "0xb7b9B9D35e7F9E324C762235FB69848175C03A19", + "network": 137, "isKilled": false, "relativeWeightCap": "1", - "addedTimestamp": 1687258571, + "addedTimestamp": 1689617291, "pool": { - "id": "0xdf725fde6e89981fb30d9bf999841ac2c160b512000000000000000000000010", - "address": "0xDF725FdE6E89981Fb30D9bF999841aC2C160b512", + "id": "0x402cfdb7781fa85d52f425352661128250b79e12000000000000000000000be3", + "address": "0x402cFDb7781fa85d52F425352661128250B79e12", "poolType": "ComposableStable", - "symbol": "B-wstETH/rETH-STABLE", + "symbol": "MaticX-bb-a-WMATIC-BPT", "tokens": [ { - "address": "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9", + "address": "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488", "weight": "null", - "symbol": "wstETH" + "symbol": "bb-a-WMATIC" }, { - "address": "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942", + "address": "0xfa68FB4628DFF1028CFEc22b4162FCcd0d45efb6", "weight": "null", - "symbol": "rETH" - } - ] - }, - "tokenLogoURIs": { - "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5d8cff95d7a57c0bf50b30b43c7cc0d52825d4a9.png", - "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xb23c20efce6e24acca0cef9b7b7aa196b84ec942.png" - } - }, - { - "address": "0xc85679E41f1F98E694D9F8983fdD484F98F2eB02", - "network": 1101, - "isKilled": false, - "relativeWeightCap": "1", - "addedTimestamp": 1687258571, - "pool": { - "id": "0x9e2d87f904862671eb49cb358e74284762cc9f42000200000000000000000013", - "address": "0x9e2D87f904862671eb49cB358E74284762cC9F42", - "poolType": "Weighted", - "symbol": "B-wstETH/bboUSD", - "tokens": [ - { - "address": "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9", - "weight": "0.5", - "symbol": "wstETH" - }, - { - "address": "0xe274c9deb6ed34cfe4130F8D0A8a948deA5bB286", - "weight": "0.5", - "symbol": "bb-o-USD" - } - ] - }, - "tokenLogoURIs": { - "0x5D8cfF95D7A57c0BF50B30b43c7CC0D52825D4a9": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5d8cff95d7a57c0bf50b30b43c7cc0d52825d4a9.png", - "0xe274c9deb6ed34cfe4130F8D0A8a948deA5bB286": "" - } - }, - { - "address": "0x7949426d750FEFC25754F149B2FB446B60c39387", - "network": 1101, - "isKilled": false, - "relativeWeightCap": "1", - "addedTimestamp": 1687258571, - "pool": { - "id": "0x6f34a44fce1506352a171232163e7716dd073ade000200000000000000000015", - "address": "0x6F34a44FCe1506352A171232163E7716Dd073ade", - "poolType": "Weighted", - "symbol": "B-rETH-bboUSD", - "tokens": [ - { - "address": "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942", - "weight": "0.5", - "symbol": "rETH" - }, - { - "address": "0xe274c9deb6ed34cfe4130F8D0A8a948deA5bB286", - "weight": "0.5", - "symbol": "bb-o-USD" - } - ] - }, - "tokenLogoURIs": { - "0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xb23c20efce6e24acca0cef9b7b7aa196b84ec942.png", - "0xe274c9deb6ed34cfe4130F8D0A8a948deA5bB286": "" - } - }, - { - "address": "0x359EA8618c405023Fc4B98dAb1B01F373792a126", - "network": 42161, - "isKilled": true, - "relativeWeightCap": "null", - "addedTimestamp": 1650405644, - "pool": { - "id": "0x64541216bafffeec8ea535bb71fbc927831d0595000100000000000000000002", - "address": "0x64541216bAFFFEec8ea535BB71Fbc927831d0595", - "poolType": "Weighted", - "symbol": "B-33WETH-33WBTC-33USDC", - "tokens": [ - { - "address": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", - "weight": "0.333333333333333333", - "symbol": "WBTC" - }, - { - "address": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1", - "weight": "0.333333333333333334", - "symbol": "WETH" - }, - { - "address": "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8", - "weight": "0.333333333333333333", - "symbol": "USDC" + "symbol": "MaticX" } ] }, "tokenLogoURIs": { - "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png", - "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrum/assets/0x82aF49447D8a07e3bd95BD0d56f35241523fBab1/logo.png", - "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xff970a61a04b1ca14834a43f5de4533ebddb5cc8.png" + "0xb0C830DCeB4EF55A60192472c20C8bf19dF03488": "", + "0xfa68FB4628DFF1028CFEc22b4162FCcd0d45efb6": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xfa68fb4628dff1028cfec22b4162fccd0d45efb6.png" } }, { @@ -5957,5 +6067,156 @@ "0x6CDA1D3D092811b2d48F7476adb59A6239CA9b95": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x6cda1d3d092811b2d48f7476adb59a6239ca9b95.png", "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrum/assets/0x82aF49447D8a07e3bd95BD0d56f35241523fBab1/logo.png" } + }, + { + "address": "0xD2C2b1C0F8Ad6E653eD7064fa7bAd7a22De8B249", + "network": 42161, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0x26e5c5e2b48815b59640a1a82ac3c2249188daf4000000000000000000000476", + "address": "0x26e5C5e2b48815b59640a1a82ac3C2249188Daf4", + "poolType": "ComposableStable", + "symbol": "alETH/wstETH-BPT", + "tokens": [ + { + "address": "0x17573150d67d820542EFb24210371545a4868B03", + "weight": "null", + "symbol": "alETH" + }, + { + "address": "0x5979D7b546E38E414F7E9822514be443A4800529", + "weight": "null", + "symbol": "wstETH" + } + ] + }, + "tokenLogoURIs": { + "0x17573150d67d820542EFb24210371545a4868B03": "", + "0x5979D7b546E38E414F7E9822514be443A4800529": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5979d7b546e38e414f7e9822514be443a4800529.png" + } + }, + { + "address": "0xCe540832f7c790d25345Aa19FB1Db3cfDEA04611", + "network": 42161, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0xfa92d9dd808d0e8d68079bdc7f01e74658e1ef15000000000000000000000477", + "address": "0xfA92D9Dd808D0E8D68079BDc7f01E74658E1EF15", + "poolType": "ComposableStable", + "symbol": "alETH/rETH-BPT", + "tokens": [ + { + "address": "0x17573150d67d820542EFb24210371545a4868B03", + "weight": "null", + "symbol": "alETH" + }, + { + "address": "0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8", + "weight": "null", + "symbol": "rETH" + } + ] + }, + "tokenLogoURIs": { + "0x17573150d67d820542EFb24210371545a4868B03": "", + "0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xec70dcb4a1efa46b8f2d97c310c9c4790ba5ffa8.png" + } + }, + { + "address": "0xb12ADA23eE766bd6b596E2bE556ea2046758b87c", + "network": 42161, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0xbe0f30217be1e981add883848d0773a86d2d2cd4000000000000000000000471", + "address": "0xBe0f30217BE1e981aDD883848D0773A86d2d2CD4", + "poolType": "ComposableStable", + "symbol": "rETH-bb-a-WETH-BPT", + "tokens": [ + { + "address": "0xaD28940024117B442a9EFB6D0f25C8B59e1c950B", + "weight": "null", + "symbol": "bb-a-WETH" + }, + { + "address": "0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8", + "weight": "null", + "symbol": "rETH" + } + ] + }, + "tokenLogoURIs": { + "0xaD28940024117B442a9EFB6D0f25C8B59e1c950B": "", + "0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xec70dcb4a1efa46b8f2d97c310c9c4790ba5ffa8.png" + } + }, + { + "address": "0x80aed5C5C683FEC86817C98da334DD72424E7297", + "network": 42161, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0x45c4d1376943ab28802b995acffc04903eb5223f000000000000000000000470", + "address": "0x45C4D1376943Ab28802B995aCfFC04903Eb5223f", + "poolType": "ComposableStable", + "symbol": "wstETH-bb-a-WETH-BPT", + "tokens": [ + { + "address": "0x5979D7b546E38E414F7E9822514be443A4800529", + "weight": "null", + "symbol": "wstETH" + }, + { + "address": "0xaD28940024117B442a9EFB6D0f25C8B59e1c950B", + "weight": "null", + "symbol": "bb-a-WETH" + } + ] + }, + "tokenLogoURIs": { + "0x5979D7b546E38E414F7E9822514be443A4800529": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5979d7b546e38e414f7e9822514be443a4800529.png", + "0xaD28940024117B442a9EFB6D0f25C8B59e1c950B": "" + } + }, + { + "address": "0x9ab40B6e1330Ce70B9e07cD691f281c1539944E6", + "network": 42161, + "isKilled": false, + "relativeWeightCap": "1", + "addedTimestamp": 1689617291, + "pool": { + "id": "0xc6eee8cb7643ec2f05f46d569e9ec8ef8b41b389000000000000000000000475", + "address": "0xc6EeE8cb7643eC2F05F46d569e9eC8EF8b41b389", + "poolType": "ComposableStable", + "symbol": "bb-a-USD", + "tokens": [ + { + "address": "0x6CB787a419c3e6Ee2e9FF365856c29CD10659113", + "weight": "null", + "symbol": "bb-a-DAI" + }, + { + "address": "0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE", + "weight": "null", + "symbol": "bb-a-USDC" + }, + { + "address": "0xc46be4B8Bb6B5A3d3120660efae9C5416318ED40", + "weight": "null", + "symbol": "bb-a-USDT" + } + ] + }, + "tokenLogoURIs": { + "0x6CB787a419c3e6Ee2e9FF365856c29CD10659113": "", + "0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE": "", + "0xc46be4B8Bb6B5A3d3120660efae9C5416318ED40": "" + } } ] diff --git a/src/lib/config/arbitrum/pools.ts b/src/lib/config/arbitrum/pools.ts index 0572738f6f..f3b13a2cb2 100644 --- a/src/lib/config/arbitrum/pools.ts +++ b/src/lib/config/arbitrum/pools.ts @@ -142,6 +142,11 @@ const pools: Pools = { '0x567ecfcb22205d279bb8eed3e066989902bf03d5000000000000000000000452', '0xc7fa3a3527435720f0e2a4c1378335324dd4f9b3000200000000000000000459', '0x01990f1e6f7f32296f125ee9469705c1c070054d000000000000000000000461', + '0x26e5c5e2b48815b59640a1a82ac3c2249188daf4000000000000000000000476', + '0xfa92d9dd808d0e8d68079bdc7f01e74658e1ef15000000000000000000000477', + '0xbe0f30217be1e981add883848d0773a86d2d2cd4000000000000000000000471', + '0x45c4d1376943ab28802b995acffc04903eb5223f000000000000000000000470', + '0xc6eee8cb7643ec2f05f46d569e9ec8ef8b41b389000000000000000000000475', ], AllowList: [], }, diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index 8775725321..b6d5f3329f 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -325,6 +325,17 @@ const pools: Pools = { '0xbfce47224b4a938865e3e2727dc34e0faa5b1d82000000000000000000000527', '0x156c02f3f7fef64a3a9d80ccf7085f23cce91d76000000000000000000000570', '0x9d7f992c900fbea0ec314bdd71b7cc1becf76a33000200000000000000000573', + '0x4cbde5c4b4b53ebe4af4adb85404725985406163000000000000000000000595', + '0xbf2ef8bdc2fc0f3203b3a01778e3ec5009aeef3300000000000000000000058d', + '0x3fa8c89704e5d07565444009e5d9e624b40be813000000000000000000000599', + '0x7d98f308db99fdd04bbf4217a4be8809f38faa6400020000000000000000059b', + '0xb2b918f2d628b4c8ff237b0a1c6ac3bea222fedc00020000000000000000059c', + '0xc2b021133d1b0cf07dba696fd5dd89338428225b000000000000000000000598', + '0x9a172e1cb0e99f7e6dcc4c52e4655e8f337d5c0000000000000000000000059a', + '0x42ed016f826165c2e5976fe5bc3df540c5ad0af700000000000000000000058b', + '0xc443c15033fcb6cf72cc24f1bda0db070ddd9786000000000000000000000593', + '0x41503c9d499ddbd1dcdf818a1b05e9774203bf46000000000000000000000594', + '0xd7edb56f63b2a0191742aea32df1f98ca81ed9c600000000000000000000058e', ], AllowList: [], }, diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index a4a7a3d60c..f85587c8d5 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -210,6 +210,9 @@ const pools: Pools = { '0x3efb91c4f9b103ee45885695c67794591916f34e000200000000000000000b43', '0x924ec7ed38080e40396c46f6206a6d77d0b9f72d00020000000000000000072a', '0x8fbd0f8e490735cfc3abf4f29cbddd5c3289b9a7000000000000000000000b5b', + '0xb266ac3b7c98d7bcb28731dac0ef42dba1b276be000000000000000000000be4', + '0xac2cae8d2f78a4a8f92f20dbe74042cd0a8d5af3000000000000000000000be2', + '0x402cfdb7781fa85d52f425352661128250b79e12000000000000000000000be3', ], AllowList: [], }, From a05b7c83ca7c06589719412cbcb5ef93654ad947 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 17 Jul 2023 19:03:36 +0000 Subject: [PATCH 06/56] 1.114.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fd4b92cdd..d8f85844a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.2", + "version": "1.114.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.2", + "version": "1.114.3", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 35550c2c45..7b0837f3ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.2", + "version": "1.114.3", "engines": { "node": "=16", "npm": ">=8" From 7f0a4fa22142d7da212e35621023598e523ae065 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Mon, 17 Jul 2023 21:07:12 +0100 Subject: [PATCH 07/56] chore: Bump SDK version (#3724) --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8f85844a9..c56f811afb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.3-beta.4", + "@balancer-labs/sdk": "^1.1.3-beta.10", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", @@ -1522,9 +1522,9 @@ } }, "node_modules/@balancer-labs/sdk": { - "version": "1.1.3-beta.4", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.4.tgz", - "integrity": "sha512-wjIOycCKfYCl3ttDGMrMA8/+QFdQpFJNbCtUkN9sOr64SO2mpiK1Z4ZIasa9tdW4sK8hsEnZnRbPgSFap6GbfQ==", + "version": "1.1.3-beta.10", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.10.tgz", + "integrity": "sha512-m6+WqGsL+jEeiXEy3yWkfxjYDpVDyo3qHoYTogO5fOEwlKcu2+NZ19iHLxDukG8Dinl3XwwU/Tli55ZB0XRdnQ==", "dev": true, "dependencies": { "@balancer-labs/sor": "4.1.1-beta.9", @@ -29553,9 +29553,9 @@ } }, "@balancer-labs/sdk": { - "version": "1.1.3-beta.4", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.4.tgz", - "integrity": "sha512-wjIOycCKfYCl3ttDGMrMA8/+QFdQpFJNbCtUkN9sOr64SO2mpiK1Z4ZIasa9tdW4sK8hsEnZnRbPgSFap6GbfQ==", + "version": "1.1.3-beta.10", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.10.tgz", + "integrity": "sha512-m6+WqGsL+jEeiXEy3yWkfxjYDpVDyo3qHoYTogO5fOEwlKcu2+NZ19iHLxDukG8Dinl3XwwU/Tli55ZB0XRdnQ==", "dev": true, "requires": { "@balancer-labs/sor": "4.1.1-beta.9", diff --git a/package.json b/package.json index 7b0837f3ce..71e1332a8f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.3-beta.4", + "@balancer-labs/sdk": "^1.1.3-beta.10", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", From 62c68ec6b6a030241dd7704c0ce36f3c844dba95 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 17 Jul 2023 20:07:26 +0000 Subject: [PATCH 08/56] 1.114.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c56f811afb..553094098e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.3", + "version": "1.114.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.3", + "version": "1.114.4", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 71e1332a8f..10396a5b8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.3", + "version": "1.114.4", "engines": { "node": "=16", "npm": ">=8" From 6c2c341ba38c012bd4707c2f41a9ccd115995e32 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Tue, 18 Jul 2023 17:55:17 +1000 Subject: [PATCH 09/56] Hotfix: Add approval check to swap (#3712) * Use tokenApprovalActions for Swaps Refactor swapping to use TokenApprovalActions so that it checks the user has made their allowance high enough to swap their token. * Rename isEthSwap to isNativeAssetSwap to be clearer for Polygon * Make Lido rate provider work on Goerli * Disable swap button into approvals have loaded --- src/components/cards/SwapCard/SwapCard.vue | 4 +- src/components/modals/SwapPreviewModal.vue | 82 ++++++++----------- src/composables/approvals/types.ts | 1 + .../approvals/useTokenApprovalActions.ts | 8 ++ src/composables/swap/useSwapping.ts | 10 +-- src/lib/utils/balancer/lido.ts | 16 +++- src/locales/default.json | 3 +- 7 files changed, 64 insertions(+), 60 deletions(-) diff --git a/src/components/cards/SwapCard/SwapCard.vue b/src/components/cards/SwapCard/SwapCard.vue index e5cb1c0870..a5764fb67d 100644 --- a/src/components/cards/SwapCard/SwapCard.vue +++ b/src/components/cards/SwapCard/SwapCard.vue @@ -262,10 +262,10 @@ export default defineComponent({ }); const title = computed(() => { if (swapping.wrapType.value === WrapType.Wrap) { - return `${t('wrap')} ${swapping.tokenIn.value.symbol}`; + return `${t('wrap')} ${swapping.tokenIn.value?.symbol}`; } if (swapping.wrapType.value === WrapType.Unwrap) { - return `${t('unwrap')} ${swapping.tokenOut.value.symbol}`; + return `${t('unwrap')} ${swapping.tokenOut.value?.symbol}`; } return t('swap'); }); diff --git a/src/components/modals/SwapPreviewModal.vue b/src/components/modals/SwapPreviewModal.vue index e091eb98ee..020dcb49b2 100644 --- a/src/components/modals/SwapPreviewModal.vue +++ b/src/components/modals/SwapPreviewModal.vue @@ -11,9 +11,11 @@ import useRelayerApproval, { RelayerType, } from '@/composables/approvals/useRelayerApproval'; import useRelayerApprovalTx from '@/composables/approvals/useRelayerApprovalTx'; -import useTokenApproval from '@/composables/approvals/useTokenApproval'; +import useTokenApprovalActions from '@/composables/approvals/useTokenApprovalActions'; +import { ApprovalAction } from '@/composables/approvals/types'; import { UseSwapping } from '@/composables/swap/useSwapping'; import useNumbers, { FNumFormats } from '@/composables/useNumbers'; +import useNetwork from '@/composables/useNetwork'; import { useTokens } from '@/providers/tokens.provider'; import { useUserSettings } from '@/providers/user-settings.provider'; import { FiatCurrency } from '@/constants/currency'; @@ -22,7 +24,6 @@ import { isStETH } from '@/lib/utils/balancer/lido'; import { getWrapAction, WrapType } from '@/lib/utils/balancer/wrapper'; import useWeb3 from '@/services/web3/useWeb3'; import { TransactionActionInfo } from '@/types/transactions'; -import { TransactionResponse } from '@ethersproject/abstract-provider'; const PRICE_UPDATE_THRESHOLD = 0.02; @@ -43,9 +44,10 @@ const emit = defineEmits(['swap', 'close']); */ const { t } = useI18n(); const { fNum, toFiat } = useNumbers(); -const { tokens, balanceFor, approvalRequired } = useTokens(); +const { balanceFor } = useTokens(); const { blockNumber, account, startConnectWithInjectedProvider } = useWeb3(); const { slippage } = useUserSettings(); +const { networkConfig } = useNetwork(); /** * STATE @@ -56,6 +58,7 @@ const lastQuote = ref( const priceUpdated = ref(false); const priceUpdateAccepted = ref(false); const showSummaryInFiat = ref(false); +const loadingApprovals = ref(true); /** * COMPUTED @@ -102,7 +105,7 @@ const exceedsBalance = computed(() => { }); const disableSubmitButton = computed(() => { - return !!exceedsBalance.value || !!props.error; + return !!exceedsBalance.value || !!props.error || !!loadingApprovals.value; }); const summary = computed(() => { @@ -257,11 +260,8 @@ const isStETHSwap = computed( wrapType.value === WrapType.NonWrap ); -const tokenApproval = useTokenApproval( - addressIn, - props.swapping.tokenInAmountInput, - tokens -); +const { getTokenApprovalActions } = useTokenApprovalActions(); +const tokenApprovalActions = ref([]); const { relayerSignature: batchRelayerSignature, @@ -281,19 +281,6 @@ const pools = computed(() => { return props.swapping.sor.pools.value; }); -const requiresTokenApproval = computed(() => { - if (props.swapping.isWrap.value && !props.swapping.isEthSwap.value) { - return approvalRequired( - props.swapping.tokenIn.value.address, - props.swapping.tokenInAmountInput.value, - props.swapping.tokenOut.value.address - ); - } else if (props.swapping.requiresTokenApproval.value) { - return !tokenApproval.isUnlockedV2.value; - } - return false; -}); - const requiresBatchRelayerApproval = computed( () => props.swapping.isJoinExitSwap.value && @@ -313,13 +300,6 @@ const requiresLidoRelayerApproval = computed( props.swapping.isBalancerSwap.value && !lidoRelayerApproval.isUnlocked.value ); -const showTokenApprovalStep = computed( - () => - requiresTokenApproval.value || - tokenApproval.approved.value || - tokenApproval.approving.value -); - const showBatchRelayerApprovalStep = computed( () => props.swapping.isJoinExitSwap.value && @@ -347,8 +327,7 @@ const requiresApproval = computed( () => requiresBatchRelayerApproval.value || requiresCowswapRelayerApproval.value || - requiresLidoRelayerApproval.value || - requiresTokenApproval.value + requiresLidoRelayerApproval.value ); const showPriceUpdateError = computed( @@ -367,18 +346,8 @@ const actions = computed((): TransactionActionInfo[] => { actions.push(batchRelayerApprovalAction.value); } - if (showTokenApprovalStep.value) { - actions.push({ - label: t('transactionSummary.approveForSwapping', [ - props.swapping.tokenIn.value.symbol, - ]), - loadingLabel: t('actionSteps.approve.loadingLabel'), - confirmingLabel: t('confirming'), - action: approveToken, - stepTooltip: t( - 'swapSummary.transactionTypesTooltips.tokenApproval.content' - ), - }); + if (tokenApprovalActions.value.length > 0) { + actions.push(tokenApprovalActions.value[0]); } actions.push({ @@ -466,15 +435,15 @@ function handlePriceUpdate() { } } -async function approveToken(): Promise { - if (props.swapping.isWrap.value && !props.swapping.isEthSwap.value) { +const tokenApprovalSpender = computed(() => { + if (props.swapping.isWrap.value && !props.swapping.isNativeAssetSwap.value) { // If we're wrapping a token other than native ETH // we need to approve the underlying on the wrapper - return tokenApproval.approveSpender(props.swapping.tokenOut.value.address); + return props.swapping.tokenOut.value.address; } else { - return tokenApproval.approveV2(); + return networkConfig.addresses.vault; } -} +}); /** * WATCHERS @@ -482,6 +451,23 @@ async function approveToken(): Promise { watch(blockNumber, () => { handlePriceUpdate(); }); + +/** + * LIFECYCLE + */ +onBeforeMount(async () => { + tokenApprovalActions.value = await getTokenApprovalActions({ + amountsToApprove: [ + { + address: addressIn.value, + amount: props.swapping.tokenInAmountInput.value, + }, + ], + spender: tokenApprovalSpender.value, + actionType: ApprovalAction.Swapping, + }); + loadingApprovals.value = false; +});