From 9e8ee5c156bb65a2855fdda22e16bcfc0acf4119 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 24 Jul 2023 11:02:21 +0800 Subject: [PATCH 1/9] Add additional logging on exit error. --- .../balancer/pools/exits/handlers/exact-in-exit.handler.ts | 7 ++++++- .../pools/exits/handlers/exact-out-exit.handler.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/services/balancer/pools/exits/handlers/exact-in-exit.handler.ts b/src/services/balancer/pools/exits/handlers/exact-in-exit.handler.ts index 950edf47c2..580e0543ba 100644 --- a/src/services/balancer/pools/exits/handlers/exact-in-exit.handler.ts +++ b/src/services/balancer/pools/exits/handlers/exact-in-exit.handler.ts @@ -59,7 +59,12 @@ export class ExactInExitHandler implements ExitPoolHandler { if (!sdkPool) throw new Error('Failed to find pool: ' + this.pool.value.id); if (!tokenOut) - throw new Error('Could not find exit token in pool tokens list.'); + throw new Error( + 'Could not find exit token in pool tokens list: ' + + amountsOut[0].address + + ' allTokens: ' + + JSON.stringify(Object.keys(tokenInfo)) + ); const isSingleTokenExit = amountsOut.length === 1; const evmBptIn = parseFixed(bptIn, 18).toString(); diff --git a/src/services/balancer/pools/exits/handlers/exact-out-exit.handler.ts b/src/services/balancer/pools/exits/handlers/exact-out-exit.handler.ts index 7950b51f3f..f86f722bc6 100644 --- a/src/services/balancer/pools/exits/handlers/exact-out-exit.handler.ts +++ b/src/services/balancer/pools/exits/handlers/exact-out-exit.handler.ts @@ -50,7 +50,12 @@ export class ExactOutExitHandler implements ExitPoolHandler { if (!sdkPool) throw new Error('Failed to find pool: ' + this.pool.value.id); if (!tokenOut) - throw new Error('Could not find exit token in pool tokens list.'); + throw new Error( + 'Could not find exit token in pool tokens list: ' + + amountsOut[0].address + + ' allTokens: ' + + JSON.stringify(Object.keys(tokenInfo)) + ); const tokenOutAddress = formatAddressForSor(tokenOut.address); const nativeAssetExit = isSameAddress(tokenOutAddress, POOLS.ZeroAddress); From e6087ab4ac004c2f754b02ca020327a04aa2829d Mon Sep 17 00:00:00 2001 From: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Date: Mon, 24 Jul 2023 03:30:14 -0400 Subject: [PATCH 2/9] arb pools whitelist (#3782) --- src/lib/config/arbitrum/pools.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib/config/arbitrum/pools.ts b/src/lib/config/arbitrum/pools.ts index 9d8f842114..11ac54ac8e 100644 --- a/src/lib/config/arbitrum/pools.ts +++ b/src/lib/config/arbitrum/pools.ts @@ -50,6 +50,10 @@ const pools: Pools = { '0x45c4d1376943ab28802b995acffc04903eb5223f000000000000000000000470', // wstETH-bb-a-WETH '0xc6eee8cb7643ec2f05f46d569e9ec8ef8b41b389000000000000000000000475', // bb-a-USD '0x3fd4954a851ead144c2ff72b1f5a38ea5976bd54000000000000000000000480', // ankreth/wsteth + '0x9cebf13bb702f253abf1579294694a1edad00eaa000000000000000000000486', // bb-a-usdc/bb-a-usdc.e + '0x4a2f6ae7f3e5d715689530873ec35593dc28951b000000000000000000000481', // reth/cbeth/wseth + '0xa8af146d79ac0bb981e4e0d8b788ec5711b1d5d000000000000000000000047b', // dai+/usd+ + '0xd6d20527c7b0669989ee082b9d3a1c63af742290000000000000000000000483', // dola/usd+ ], }, Investment: { @@ -226,6 +230,9 @@ const pools: Pools = { '0xbe0f30217be1e981add883848d0773a86d2d2cd4000000000000000000000471', // rETH-bb-a-WETH '0x45c4d1376943ab28802b995acffc04903eb5223f000000000000000000000470', // wstETH-bb-a-WETH '0xc6eee8cb7643ec2f05f46d569e9ec8ef8b41b389000000000000000000000475', // bb-a-USD + '0xa8af146d79ac0bb981e4e0d8b788ec5711b1d5d000000000000000000000047b', // dai+/usd+ + '0xd6d20527c7b0669989ee082b9d3a1c63af742290000000000000000000000483', // dola/usd+ + '0x9cebf13bb702f253abf1579294694a1edad00eaa000000000000000000000486', // bb-a-usdc/bb-a-usdc.e ], Deprecated: { // '0x178e029173417b1f9c8bc16dcec6f697bc323746000200000000000000000158': { From 2c13187dc870fa9cfba857966464a5567bbb70fd Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 24 Jul 2023 07:30:30 +0000 Subject: [PATCH 3/9] 1.114.37 --- 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 64f9f2c0fc..11001e72d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.36", + "version": "1.114.37", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.36", + "version": "1.114.37", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 5bd8aea49c..0c197aa1d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.36", + "version": "1.114.37", "engines": { "node": "=16", "npm": ">=8" From f87cbd73448b426018f496646251ea2541d1815c Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 24 Jul 2023 07:47:13 +0000 Subject: [PATCH 4/9] 1.114.38 --- 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 11001e72d3..dfbd0f97d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.37", + "version": "1.114.38", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.37", + "version": "1.114.38", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 0c197aa1d2..f419032b94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.37", + "version": "1.114.38", "engines": { "node": "=16", "npm": ">=8" From ec69b6fcf2c990ac4f5a796b138ca8e1291bac3a Mon Sep 17 00:00:00 2001 From: daniel <91405705+danielmkm@users.noreply.github.com> Date: Mon, 24 Jul 2023 18:23:20 +0800 Subject: [PATCH 5/9] Hotfix: Add liquidity - clear amount when changing token (#3784) * Add liquidity - clear amount when changing token * Add additional check --- .../pool_actions/AddLiquidityForm/AddLiquidityForm.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue b/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue index b84b17581b..5803a6ba60 100644 --- a/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue +++ b/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue @@ -128,6 +128,15 @@ function tokenOptions(address: string): string[] { : []; } +/** + * When changing tokens, clear the amount value + */ +function onTokenChange() { + if (isSingleAssetJoin.value && amountsIn.value.length > 0) { + amountsIn.value[0].value = ''; + } +} + /** * CALLBACKS */ @@ -193,6 +202,7 @@ watch( class="mb-4" :fixedToken="!isSingleAssetJoin" :excludedTokens="excludedTokens" + @update:address="onTokenChange" /> Date: Mon, 24 Jul 2023 10:23:37 +0000 Subject: [PATCH 6/9] 1.114.39 --- 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 dfbd0f97d8..fe1f869ccc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.38", + "version": "1.114.39", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.38", + "version": "1.114.39", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index f419032b94..5166ea13f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.38", + "version": "1.114.39", "engines": { "node": "=16", "npm": ">=8" From fab6f020b8a8555fafc86d12129e6c2384b277a9 Mon Sep 17 00:00:00 2001 From: Alberto Gualis Date: Mon, 24 Jul 2023 13:28:39 +0200 Subject: [PATCH 7/9] 1.115.0 --- 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 068acef1db..452ade6ab7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.115.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.115.0", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 5166ea13f6..c1a6c2c149 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.115.0", "engines": { "node": "=16", "npm": ">=8" From 5ad274552d73ff2c9809ffa39dda61ae894bd5e8 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Mon, 24 Jul 2023 14:48:30 +0100 Subject: [PATCH 8/9] fix: Use helper function to select metadata --- .../balancer/pools/joins/handlers/swap-join.handler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/balancer/pools/joins/handlers/swap-join.handler.ts b/src/services/balancer/pools/joins/handlers/swap-join.handler.ts index c818397c08..72fe112be9 100644 --- a/src/services/balancer/pools/joins/handlers/swap-join.handler.ts +++ b/src/services/balancer/pools/joins/handlers/swap-join.handler.ts @@ -3,7 +3,7 @@ import { getTimestampSecondsFromNow } from '@/composables/useTime'; import { POOLS } from '@/constants/pools'; import { NATIVE_ASSET_ADDRESS } from '@/constants/tokens'; import { fetchPoolsForSor, hasFetchedPoolsForSor } from '@/lib/balancer.sdk'; -import { bnum, isSameAddress } from '@/lib/utils'; +import { bnum, isSameAddress, selectByAddress } from '@/lib/utils'; import { Pool } from '@/services/pool/types'; import { BalancerSDK, SwapInfo } from '@balancer-labs/sdk'; import { TransactionResponse } from '@ethersproject/abstract-provider'; @@ -56,7 +56,7 @@ export class SwapJoinHandler implements JoinPoolHandler { throw new Error('Missing amounts to join with.'); const amountIn = amountsIn[0]; - const tokenIn = tokensIn[amountIn.address]; + const tokenIn = selectByAddress(tokensIn, amountIn.address); if (!tokenIn) throw new Error('Missing critical token metadata.'); if (!amountIn.value || bnum(amountIn.value).eq(0)) return { bptOut: '0', priceImpact: 0 }; From 2c43eab139a426a9fac5aa5205821df03b1d2fc9 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Mon, 24 Jul 2023 13:48:56 +0000 Subject: [PATCH 9/9] 1.114.40 --- 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 fe1f869ccc..18aebebd89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.114.40", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.114.40", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 5166ea13f6..b24a597801 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.114.39", + "version": "1.114.40", "engines": { "node": "=16", "npm": ">=8"