From 6a3d2ab70e506560dc9d967a3e729d9dd52c4ee2 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Mon, 22 Jan 2024 16:40:26 +0000 Subject: [PATCH 1/7] Update README.md (#5132) --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a552d52b32..d583e8ae94 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ Official frontend app for the Balancer protocol (v2) -![Alt](https://repobeats.axiom.co/api/embed/9a2f4fbb502d735b6b8ec648723e686ae82f1fad.svg 'Repobeats analytics image') - ## Development To setup the development environment first clone the repo: From 26c879a5fb4aac9b33804817b35f840d451ffbca Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Fri, 26 Jan 2024 13:34:18 +0000 Subject: [PATCH 2/7] hotfix: Add branded redirect for Gyro pools on Arb (dm) (#5164) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Add 50BAL-50USDbC pool to base allowlist (#5136) Co-authored-by: balopco * 1.140.1 * chore: Add 50BAL-50USDbC pool to base allowlist (#5135) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.2 * chore: Add 50BALD-50USDC pool to base allowlist (#5134) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.3 * add stakable pools * 1.140.4 * chore: Add 50DAI-50USDbC pool to base allowlist (#5139) Co-authored-by: balopco * 1.140.5 * chore: Add wstETH/cbETH pool to arbitrum allowlist (#5143) Co-authored-by: balopco * 1.140.6 * chore: Add wstETH/sfrxETH pool to arbitrum allowlist (#5142) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.7 * chore: Add B-KAI-WETH-WEIGHTED pool to ethereum allowlist (#5141) Co-authored-by: balopco * 1.140.8 * chore: Add 50BAL-50USDC pool to base allowlist (#5137) Co-authored-by: balopco Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> * 1.140.9 * chore: Add rsETH / ETHx pool to ethereum allowlist (#5144) Co-authored-by: balopco * 1.140.10 * Added 80SYNO-20WETH pool to allowlist (#5148) * 1.140.11 * chore: Add B-kaiAURA-AURA-WEIGHTED pool to ethereum allowlist (#5149) Co-authored-by: balopco * 1.140.12 * chore: Add 50WETH-50USDbC pool to base allowlist (#5151) Co-authored-by: balopco * 1.140.13 * chore: Add 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5156) Co-authored-by: balopco * 1.140.14 * chore: Add 50USDT-50WXDAI pool to gnosis-chain allowlist (#5155) Co-authored-by: balopco * 1.140.15 * chore: Add 50WETH-50USDbC pool to base allowlist (#5154) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.16 * chore: Add 50BAL-50USDbC pool to base allowlist (#5150) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.17 * chore: Add 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5157) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.18 * chore: Add 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5158) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.19 * chore: Add 10WMATIC-20WBTC-10USDC-60STARV3-M/V-C8/StarSeeds_Protocol pool to polygon allowlist (#5159) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.20 * chore: Add 50WETH-50USDbC pool to base allowlist (#5152) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.21 * chore: Add 50WETH-50USDbC pool to base allowlist (#5153) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.22 * chore: Add branded redirects for gyro pools on ARB --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: balopco Co-authored-by: Automated Version Bump Co-authored-by: Alberto Gualis Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Co-authored-by: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> Co-authored-by: Krzysztof Cywiński --- package-lock.json | 4 ++-- package.json | 2 +- src/lib/config/arbitrum/pools.ts | 9 +++++++++ src/lib/config/base/pools.ts | 10 ++++++++++ src/lib/config/gnosis-chain/pools.ts | 1 + src/lib/config/mainnet/pools.ts | 5 +++++ src/lib/config/polygon/pools.ts | 4 ++++ 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e5cf81906..977cdf586d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.0", + "version": "1.140.22", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.140.0", + "version": "1.140.22", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index d7861ea111..4a7cc1e763 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.0", + "version": "1.140.22", "engines": { "node": "=16", "npm": ">=8" diff --git a/src/lib/config/arbitrum/pools.ts b/src/lib/config/arbitrum/pools.ts index 7738a5814e..e4b5dd06fc 100644 --- a/src/lib/config/arbitrum/pools.ts +++ b/src/lib/config/arbitrum/pools.ts @@ -76,6 +76,8 @@ const pools: Pools = { '0x2ce4457acac29da4736ae6f5cd9f583a6b335c270000000000000000000004dc', // sFRAX/4POOL '0xdfa752ca3ff49d4b6dbe08e2d5a111f51773d3950000000000000000000004e8', // sFRAX/FRAX '0xd0ec47c54ca5e20aaae4616c25c825c7f48d40690000000000000000000004ef', // rETH/wETH BPT + '0xc2598280bfea1fe18dfcabd21c7165c40c6859d30000000000000000000004f3', // wstETH/sfrxETH + '0x6fe0e32081460d0e4469e36595e32c0f343a0e9c0000000000000000000004f4', // wstETH/cbETH ], }, Investment: { @@ -164,6 +166,7 @@ const pools: Pools = { '0x9dce1f90a51ab38471ad9722e504419354a745a50002000000000000000004ee', // 50ARB-50USDC '0x05f0a172608853d5431c69888a0a559886a3319f0002000000000000000004f0', // ARSWETH '0x3e5fb03652f40b6c5a30d0c0ec38cc065332dc4d0002000000000000000004f2', // 50BAL-50ARB + '0xeb3e64ad9314d20bf943ac72fb69f272603f9cce0002000000000000000004f5', // 80SYNO-20WETH ], }, Factories: { @@ -334,6 +337,12 @@ const pools: Pools = { ], [PoolWarning.CspPoolVulnWarning]: CSP_ISSUE_POOL_IDS[Network.ARBITRUM], }, + BrandedRedirect: { + FX: 'xave', + Gyro2: 'gyro', + Gyro3: 'gyro', + GyroE: 'gyro', + }, }; export default pools; diff --git a/src/lib/config/base/pools.ts b/src/lib/config/base/pools.ts index 0d5dca8339..c76b641cf0 100644 --- a/src/lib/config/base/pools.ts +++ b/src/lib/config/base/pools.ts @@ -158,6 +158,16 @@ const pools: Pools = { '0xe2dfaa9ce690e0a4197f6367a376c11482b95dd20002000000000000000000e0', // 50USDbC-50WELL '0x3acea8a239161bc68e956fcea6b2fd0ad5da6fca0002000000000000000000e5', // 50BAL-50DAI '0x03e17ea4133bf5c87d98d663d6299baddeff9eaf0002000000000000000000e4', // 30BAL-70WETH + '0x0cc31651a39ae32c8c2147fa01c194036ac52df20002000000000000000000e9', // 50BAL-50USDC + '0x30e8ddebf3426234073deaff676e4ddce156ba3f0002000000000000000000e6', // 50BALD-50USDC + '0x26f2e20407a4588f700b6c2d550b29e73809759f0002000000000000000000e7', // 50BAL-50USDbC + '0x1ab96d1b0a5e6f7781bd88e07a54a09a099f6e750002000000000000000000e8', // 50BAL-50USDbC + '0x8bed8839f2f1ea612efc084ed483f7653a2921c40002000000000000000000ea', // 50DAI-50USDbC + '0x88a777583a2f3aa3e6c2de1d45f4a86f922acd040002000000000000000000ee', // 50WETH-50USDbC + '0x53d3149e331d94105b31b838bea94c8c735862ec0002000000000000000000ed', // 50WETH-50USDbC + '0x27d6b39bbc5fdf3a1ae8c55a8ee499ad7234377b0002000000000000000000eb', // 50BAL-50USDbC + '0x7308e18fccb00b11454f08140e7efad8161a6a2c0002000000000000000000ef', // 50WETH-50USDbC + '0x77bdaece95a25f28e1598f4126f8257ae2b8b09f0002000000000000000000ec', // 50WETH-50USDbC ], }, Factories: { diff --git a/src/lib/config/gnosis-chain/pools.ts b/src/lib/config/gnosis-chain/pools.ts index 54a4e09072..fb04639caf 100644 --- a/src/lib/config/gnosis-chain/pools.ts +++ b/src/lib/config/gnosis-chain/pools.ts @@ -77,6 +77,7 @@ const pools: Pools = { '0x92a3be6ce4cd693af08756fd71ee23bb60a97c61000200000000000000000074', // 50GNO-50WXDAI '0xc5df11757f4a8dfaccc731d13b9577f67055c6c6000200000000000000000077', // B-50EURe-50GBPe '0xea54604e7e1ddec8320cf838cfe857fbf44aad9f000200000000000000000078', // B-50GBPe-50WXDAI + '0xf94e8be09a276d2ca75aeb02113893dc5034bb66000200000000000000000079', // 50USDT-50WXDAI ], }, Factories: { diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index f39418c383..99901c5f8f 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -152,6 +152,7 @@ const pools: Pools = { '0xa2e9242163d54b536583368a01b5d232c95aa884000000000000000000000653', // ePENDLE/PENDLE '0x383e7859271b2d0589b013b6d944572a0a8be3cb000000000000000000000657', // DOLA-mkUSD BSP '0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659', // ezETH/WETH + '0x7761b6e0daa04e70637d81f1da7d186c205c2ade00000000000000000000065d', // rsETH / ETHx ], }, Investment: { @@ -258,6 +259,8 @@ const pools: Pools = { '0x6aa6d7542310cdc75d1179b8729e1e6ec8d42bf100020000000000000000064b', // 50wstETH/50sDAI '0x7fd800d3ecd9e83322cfcb8d416eb93f56edb78100010000000000000000065b', // 50PAXG-25USDC-25WETH '0x99e7b15df044e1b62e2e1774fd4469d54d9409ac00020000000000000000065a', // ECLP-GHO-USDC + '0x69d6e9636df140440eca285acc1f6c097aa57beb00020000000000000000065c', // B-KAI-WETH-WEIGHTED + '0x0560e7e02cd054055d535c3c2b59baf565c6899b00020000000000000000065f', // B-kaiAURA-AURA-WEIGHTED ], }, Factories: { @@ -474,6 +477,8 @@ const pools: Pools = { '0xb3b675a9a3cb0df8f66caf08549371bfb76a9867000200000000000000000611', '0x01536b22ea06e4a315e3daaf05a12683ed4dc14c0000000000000000000005fc', '0xa2e9242163d54b536583368a01b5d232c95aa884000000000000000000000653', + '0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659', + '0x383e7859271b2d0589b013b6d944572a0a8be3cb000000000000000000000657', ], AllowList: [ '0x54ca50ee86616379420cc56718e12566aa75abbe000200000000000000000610', // wusdm/wsteth diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index cce4651a49..39aab4db56 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -477,6 +477,10 @@ const pools: Pools = { '0xcb14b8be85093205d353a4cb9c712879f2e325a7000200000000000000000daf', // 50USDC-50USDT '0x6ad3997cb8820e3af5a7b9dd71401d61b7b817b7000200000000000000000dad', // 50WBTC-50USDT '0x9662eb5aab72de20113c97a91364a6285008460e000200000000000000000dae', // 20WBTC-80STARV3-M/V-P1/StarSeeds_Protocol + '0x15219e7b03c7e67a79b8fd6b427a3f008b4837c8000100000000000000000db5', // 10WMATIC-20WBTC-10USDC-60STARV3-M/V-C8/StarSeeds_Protocol + '0x91efb2e3d2c3c936ac1a83fa25400188f7f2aeef000100000000000000000db4', // 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol + '0x4fb042c8ef4484f5d16b4450a0a5fae08334dc66000100000000000000000db3', // 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol + '0xa8d0f5db2c67253b75c1b348a9767184e21930ec000100000000000000000db2', // 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol ], }, Factories: { From eece1863ecbba6f96b28cc83192560bfcf60c3c3 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Fri, 26 Jan 2024 13:44:27 +0000 Subject: [PATCH 3/7] chore: init (#5165) --- src/assets/images/icons/protocols/cowswap.svg | 1 + src/components/cards/SwapCard/SwapCard.vue | 73 ------------------- src/components/links/CowswapLink.vue | 24 ++++++ src/composables/swap/useSwapping.ts | 6 +- src/composables/useNetwork.ts | 4 + src/lib/utils/urls.ts | 9 +++ src/pages/swap.vue | 4 +- 7 files changed, 43 insertions(+), 78 deletions(-) create mode 100644 src/assets/images/icons/protocols/cowswap.svg create mode 100644 src/components/links/CowswapLink.vue diff --git a/src/assets/images/icons/protocols/cowswap.svg b/src/assets/images/icons/protocols/cowswap.svg new file mode 100644 index 0000000000..267ac71431 --- /dev/null +++ b/src/assets/images/icons/protocols/cowswap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/cards/SwapCard/SwapCard.vue b/src/components/cards/SwapCard/SwapCard.vue index a5764fb67d..cf22b5fa38 100644 --- a/src/components/cards/SwapCard/SwapCard.vue +++ b/src/components/cards/SwapCard/SwapCard.vue @@ -60,79 +60,6 @@ block @click.prevent="handlePreviewButton" /> -
- -
-
- ⛽ - -

- {{ $t('swapToggle.wrapEth') }} -

-

- {{ $t('swapToggle.unwrapEth') }} -

-

- {{ $t('swapToggle.fromEth') }} -

- -
-
- -
-
- - -
- - - {{ $t('swapToggle.swapGasless') }} - {{ $t('swapToggle.swapWithGas') }} - - - -
- -
-
- -
+import { buildProtocolIconURL } from '@/lib/utils/urls'; + + + diff --git a/src/composables/swap/useSwapping.ts b/src/composables/swap/useSwapping.ts index 99a8ba2027..b00cb12076 100644 --- a/src/composables/swap/useSwapping.ts +++ b/src/composables/swap/useSwapping.ts @@ -3,7 +3,7 @@ import { parseFixed } from '@ethersproject/bignumber'; import LS_KEYS from '@/constants/local-storage.keys'; import { NATIVE_ASSET_ADDRESS } from '@/constants/tokens'; -import { bnum, lsGet, lsSet } from '@/lib/utils'; +import { bnum, lsSet } from '@/lib/utils'; import { getWrapAction, WrapType } from '@/lib/utils/balancer/wrapper'; import { COW_SUPPORTED_NETWORKS } from '@/services/cowswap/constants'; import { @@ -26,9 +26,7 @@ export type SwapRoute = 'wrapUnwrap' | 'balancer' | 'cowswap' | 'joinExit'; export type UseSwapping = ReturnType; -export const swapGasless = ref( - lsGet(LS_KEYS.Swap.Gasless, true) -); +export const swapGasless = ref(false); export default function useSwapping( exactIn: Ref, diff --git a/src/composables/useNetwork.ts b/src/composables/useNetwork.ts index 6e1baba623..9daad7f5a7 100644 --- a/src/composables/useNetwork.ts +++ b/src/composables/useNetwork.ts @@ -62,6 +62,10 @@ export const isPoolBoostsEnabled = computed( () => configService.network.pools.BoostsEnabled ); +export const isCowswapSupportedNetwork = computed( + () => isMainnet.value || isGnosis.value +); + /** * METHODS */ diff --git a/src/lib/utils/urls.ts b/src/lib/utils/urls.ts index a83541e7c0..eb581de660 100644 --- a/src/lib/utils/urls.ts +++ b/src/lib/utils/urls.ts @@ -36,3 +36,12 @@ export function buildConnectorIconURL(wallet: Wallet): string { import.meta.url ).href; } + +export function buildProtocolIconURL(protocol: string): string { + return new URL( + // https://vitejs.dev/guide/assets.html#new-url-url-import-meta-url + // Warning: Don't extract this template into a variable or it will stop working in production builds + `/src/assets/images/icons/protocols/${protocol}.svg`, + import.meta.url + ).href; +} diff --git a/src/pages/swap.vue b/src/pages/swap.vue index 9278408058..ecdafa48cb 100644 --- a/src/pages/swap.vue +++ b/src/pages/swap.vue @@ -7,8 +7,9 @@ import Col3Layout from '@/components/layouts/Col3Layout.vue'; import usePoolFilters from '@/composables/pools/usePoolFilters'; import useBreakpoints from '@/composables/useBreakpoints'; import BridgeLink from '@/components/links/BridgeLink.vue'; -import { hasBridge } from '@/composables/useNetwork'; +import { hasBridge, isCowswapSupportedNetwork } from '@/composables/useNetwork'; import { provideUserTokens } from '@/providers/local/user-tokens.provider'; +import CowswapLink from '@/components/links/CowswapLink.vue'; /** * PROVIDERS @@ -70,6 +71,7 @@ onMounted(() => { From 04f9bcef4ebc871a04809bcf56b38296d3b6a0ad Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Wed, 31 Jan 2024 10:27:36 +0000 Subject: [PATCH 4/7] chore: Add label for new factory (dm) (#5183) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Add 50BAL-50USDbC pool to base allowlist (#5136) Co-authored-by: balopco * 1.140.1 * chore: Add 50BAL-50USDbC pool to base allowlist (#5135) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.2 * chore: Add 50BALD-50USDC pool to base allowlist (#5134) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.3 * add stakable pools * 1.140.4 * chore: Add 50DAI-50USDbC pool to base allowlist (#5139) Co-authored-by: balopco * 1.140.5 * chore: Add wstETH/cbETH pool to arbitrum allowlist (#5143) Co-authored-by: balopco * 1.140.6 * chore: Add wstETH/sfrxETH pool to arbitrum allowlist (#5142) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.7 * chore: Add B-KAI-WETH-WEIGHTED pool to ethereum allowlist (#5141) Co-authored-by: balopco * 1.140.8 * chore: Add 50BAL-50USDC pool to base allowlist (#5137) Co-authored-by: balopco Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> * 1.140.9 * chore: Add rsETH / ETHx pool to ethereum allowlist (#5144) Co-authored-by: balopco * 1.140.10 * Added 80SYNO-20WETH pool to allowlist (#5148) * 1.140.11 * chore: Add B-kaiAURA-AURA-WEIGHTED pool to ethereum allowlist (#5149) Co-authored-by: balopco * 1.140.12 * chore: Add 50WETH-50USDbC pool to base allowlist (#5151) Co-authored-by: balopco * 1.140.13 * chore: Add 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5156) Co-authored-by: balopco * 1.140.14 * chore: Add 50USDT-50WXDAI pool to gnosis-chain allowlist (#5155) Co-authored-by: balopco * 1.140.15 * chore: Add 50WETH-50USDbC pool to base allowlist (#5154) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.16 * chore: Add 50BAL-50USDbC pool to base allowlist (#5150) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.17 * chore: Add 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5157) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.18 * chore: Add 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5158) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.19 * chore: Add 10WMATIC-20WBTC-10USDC-60STARV3-M/V-C8/StarSeeds_Protocol pool to polygon allowlist (#5159) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.20 * chore: Add 50WETH-50USDbC pool to base allowlist (#5152) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.21 * chore: Add 50WETH-50USDbC pool to base allowlist (#5153) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.22 * chore: Add branded redirects for gyro pools on ARB (#5163) * 1.140.23 * chore: init (#5133) * 1.140.24 * chore: Add vETH/wstETH pool to ethereum allowlist (#5170) Co-authored-by: balopco * 1.140.25 * chore: Add 20WETH-80ONDO pool to ethereum allowlist * chore: Add 50cbETH-50STG pool to base allowlist (#5167) Co-authored-by: balopco * 1.140.26 * chore: Add 50USDC-50axlUSDC pool to base allowlist (#5168) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.27 * chore: Add 50BAL-50USDC.e pool to arbitrum allowlist (#5169) Co-authored-by: balopco * 1.140.28 * chore: Add 50WBTC-50ARB pool to arbitrum allowlist (#5178) Co-authored-by: balopco * 1.140.29 * chore: Add 30USDC-70USDT pool to polygon allowlist (#5181) Co-authored-by: balopco * 1.140.30 * chore: Add new factory label --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: balopco Co-authored-by: Automated Version Bump Co-authored-by: Alberto Gualis Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Co-authored-by: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> Co-authored-by: Krzysztof Cywiński --- package-lock.json | 4 ++-- package.json | 2 +- src/lib/config/arbitrum/pools.ts | 2 ++ src/lib/config/base/pools.ts | 2 ++ src/lib/config/mainnet/pools.ts | 2 ++ src/lib/config/polygon/pools.ts | 1 + src/lib/config/zkevm/pools.ts | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 977cdf586d..003b0b2747 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.22", + "version": "1.140.30", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.140.22", + "version": "1.140.30", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 4a7cc1e763..79b231272c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.22", + "version": "1.140.30", "engines": { "node": "=16", "npm": ">=8" diff --git a/src/lib/config/arbitrum/pools.ts b/src/lib/config/arbitrum/pools.ts index e4b5dd06fc..e3a341ebcf 100644 --- a/src/lib/config/arbitrum/pools.ts +++ b/src/lib/config/arbitrum/pools.ts @@ -167,6 +167,8 @@ const pools: Pools = { '0x05f0a172608853d5431c69888a0a559886a3319f0002000000000000000004f0', // ARSWETH '0x3e5fb03652f40b6c5a30d0c0ec38cc065332dc4d0002000000000000000004f2', // 50BAL-50ARB '0xeb3e64ad9314d20bf943ac72fb69f272603f9cce0002000000000000000004f5', // 80SYNO-20WETH + '0x60b3831cc85f4166f1dc3390be944a0818197bf20002000000000000000004fa', // 50BAL-50USDC.e + '0x9fe9ee7c16d7569f31385611ef2f6d08a470fdab0002000000000000000004fe', // 50WBTC-50ARB ], }, Factories: { diff --git a/src/lib/config/base/pools.ts b/src/lib/config/base/pools.ts index c76b641cf0..554f9003b5 100644 --- a/src/lib/config/base/pools.ts +++ b/src/lib/config/base/pools.ts @@ -168,6 +168,8 @@ const pools: Pools = { '0x27d6b39bbc5fdf3a1ae8c55a8ee499ad7234377b0002000000000000000000eb', // 50BAL-50USDbC '0x7308e18fccb00b11454f08140e7efad8161a6a2c0002000000000000000000ef', // 50WETH-50USDbC '0x77bdaece95a25f28e1598f4126f8257ae2b8b09f0002000000000000000000ec', // 50WETH-50USDbC + '0xc3f181b99d72697c8fa28bb7116d8eb3b1e617cf0002000000000000000000f1', // 50USDC-50axlUSDC + '0x58916cf9bab42b062277910c6a51642cd60798e70002000000000000000000f0', // 50cbETH-50STG ], }, Factories: { diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index 99901c5f8f..949dda5cf7 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -153,6 +153,7 @@ const pools: Pools = { '0x383e7859271b2d0589b013b6d944572a0a8be3cb000000000000000000000657', // DOLA-mkUSD BSP '0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659', // ezETH/WETH '0x7761b6e0daa04e70637d81f1da7d186c205c2ade00000000000000000000065d', // rsETH / ETHx + '0xd3f8ab9c5928fdf53153e7757131ad7815fe3146000000000000000000000661', // vETH/wstETH ], }, Investment: { @@ -261,6 +262,7 @@ const pools: Pools = { '0x99e7b15df044e1b62e2e1774fd4469d54d9409ac00020000000000000000065a', // ECLP-GHO-USDC '0x69d6e9636df140440eca285acc1f6c097aa57beb00020000000000000000065c', // B-KAI-WETH-WEIGHTED '0x0560e7e02cd054055d535c3c2b59baf565c6899b00020000000000000000065f', // B-kaiAURA-AURA-WEIGHTED + '0x98b76fb35387142f97d601a297276bb152ae8ab0000200000000000000000662', // 20WETH-80ONDO ], }, Factories: { diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index 39aab4db56..e97e4c9d43 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -481,6 +481,7 @@ const pools: Pools = { '0x91efb2e3d2c3c936ac1a83fa25400188f7f2aeef000100000000000000000db4', // 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol '0x4fb042c8ef4484f5d16b4450a0a5fae08334dc66000100000000000000000db3', // 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol '0xa8d0f5db2c67253b75c1b348a9767184e21930ec000100000000000000000db2', // 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol + '0xf4a88e05705ed34eb8f377db8a6dd56a1c77c33b000200000000000000000db6', // 30USDC-70USDT ], }, Factories: { diff --git a/src/lib/config/zkevm/pools.ts b/src/lib/config/zkevm/pools.ts index 82facc147e..9a44b7d9e9 100644 --- a/src/lib/config/zkevm/pools.ts +++ b/src/lib/config/zkevm/pools.ts @@ -68,6 +68,7 @@ const pools: Pools = { '0x956ccab09898c0af2aca5e6c229c3ad4e93d9288': 'composableStablePool', '0x6b1da720be2d11d95177ccfc40a917c2688f396c': 'erc4626Linear', // ERC4626 LinearPool '0x5d56ea1b2595d2dbe4f5014b967c78ce75324f0c': 'gyroE', + '0x577e5993b9cc480f07f98b5ebd055604bd9071c4': 'composableStablePool', }, Stakable: { VotingGaugePools: [ From febfec570fcf5e89328ebeac9ea741fe62b70649 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Wed, 31 Jan 2024 13:22:07 +0000 Subject: [PATCH 5/7] feat: Add LP tokens to add liquidity form (dm) (#5184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Add 50BAL-50USDbC pool to base allowlist (#5136) Co-authored-by: balopco * 1.140.1 * chore: Add 50BAL-50USDbC pool to base allowlist (#5135) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.2 * chore: Add 50BALD-50USDC pool to base allowlist (#5134) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.3 * add stakable pools * 1.140.4 * chore: Add 50DAI-50USDbC pool to base allowlist (#5139) Co-authored-by: balopco * 1.140.5 * chore: Add wstETH/cbETH pool to arbitrum allowlist (#5143) Co-authored-by: balopco * 1.140.6 * chore: Add wstETH/sfrxETH pool to arbitrum allowlist (#5142) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.7 * chore: Add B-KAI-WETH-WEIGHTED pool to ethereum allowlist (#5141) Co-authored-by: balopco * 1.140.8 * chore: Add 50BAL-50USDC pool to base allowlist (#5137) Co-authored-by: balopco Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> * 1.140.9 * chore: Add rsETH / ETHx pool to ethereum allowlist (#5144) Co-authored-by: balopco * 1.140.10 * Added 80SYNO-20WETH pool to allowlist (#5148) * 1.140.11 * chore: Add B-kaiAURA-AURA-WEIGHTED pool to ethereum allowlist (#5149) Co-authored-by: balopco * 1.140.12 * chore: Add 50WETH-50USDbC pool to base allowlist (#5151) Co-authored-by: balopco * 1.140.13 * chore: Add 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5156) Co-authored-by: balopco * 1.140.14 * chore: Add 50USDT-50WXDAI pool to gnosis-chain allowlist (#5155) Co-authored-by: balopco * 1.140.15 * chore: Add 50WETH-50USDbC pool to base allowlist (#5154) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.16 * chore: Add 50BAL-50USDbC pool to base allowlist (#5150) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.17 * chore: Add 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5157) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.18 * chore: Add 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5158) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.19 * chore: Add 10WMATIC-20WBTC-10USDC-60STARV3-M/V-C8/StarSeeds_Protocol pool to polygon allowlist (#5159) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.20 * chore: Add 50WETH-50USDbC pool to base allowlist (#5152) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.21 * chore: Add 50WETH-50USDbC pool to base allowlist (#5153) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.22 * chore: Add branded redirects for gyro pools on ARB (#5163) * 1.140.23 * chore: init (#5133) * 1.140.24 * chore: Add vETH/wstETH pool to ethereum allowlist (#5170) Co-authored-by: balopco * 1.140.25 * chore: Init --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: balopco Co-authored-by: Automated Version Bump Co-authored-by: Alberto Gualis Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Co-authored-by: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> Co-authored-by: Krzysztof Cywiński --- .../AddLiquidityForm/AddLiquidityForm.vue | 50 +++---------------- .../components/AddLiquidityTotals.vue | 31 +++++++++++- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue b/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue index fee0b52ce2..7435f07ef3 100644 --- a/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue +++ b/src/components/forms/pool_actions/AddLiquidityForm/AddLiquidityForm.vue @@ -6,7 +6,7 @@ import StakePreviewModal from '@/components/contextual/pages/pool/staking/StakeP import TokenInput from '@/components/inputs/TokenInput/TokenInput.vue'; import { tokenWeight, usePoolHelpers } from '@/composables/usePoolHelpers'; import { LOW_LIQUIDITY_THRESHOLD } from '@/constants/poolLiquidity'; -import { bnum, includesAddress, isSameAddress } from '@/lib/utils'; +import { bnum, includesAddress } from '@/lib/utils'; import { isRequired } from '@/lib/utils/validations'; import { Pool } from '@/services/pool/types'; import useWeb3 from '@/services/web3/useWeb3'; @@ -15,11 +15,9 @@ import useVeBal from '@/composables/useVeBAL'; import AddLiquidityPreview from './components/AddLiquidityPreview/AddLiquidityPreview.vue'; import AddLiquidityTotals from './components/AddLiquidityTotals.vue'; -import MissingPoolTokensAlert from './components/MissingPoolTokensAlert.vue'; import { useTokens } from '@/providers/tokens.provider'; import { isEqual } from 'lodash'; import { useJoinPool } from '@/providers/local/join-pool.provider'; -import { useUserTokens } from '@/providers/local/user-tokens.provider'; /** * TYPES @@ -42,12 +40,9 @@ const showStakeModal = ref(false); /** * COMPOSABLES */ -const { - managedPoolWithSwappingHalted, - isDeepPool, - isPreMintedBptPool, - poolJoinTokens, -} = usePoolHelpers(toRef(props, 'pool')); +const { managedPoolWithSwappingHalted, poolJoinTokens } = usePoolHelpers( + toRef(props, 'pool') +); const { veBalTokenInfo } = useVeBal(); const { isWalletReady, startConnectWithInjectedProvider, isMismatchedNetwork } = useWeb3(); @@ -64,8 +59,6 @@ const { setTokensIn, } = useJoinPool(); -const { tokensWithBalance } = useUserTokens(); - /** * COMPUTED */ @@ -85,20 +78,6 @@ const excludedTokens = computed((): string[] => { return tokens; }); -const joinTokensWithBalance = computed(() => - poolJoinTokens.value.filter( - address => - includesAddress(tokensWithBalance.value, address) || - isSameAddress(address, wrappedNativeAsset.value.address) - ) -); - -const joinTokensWithoutBalance = computed(() => - poolJoinTokens.value.filter( - address => !includesAddress(tokensWithBalance.value, address) - ) -); - async function initializeTokensForm(isSingleAssetJoin: boolean) { if (isSingleAssetJoin) { // Single asset joins are only relevant for Composable pools where swap @@ -106,7 +85,7 @@ async function initializeTokensForm(isSingleAssetJoin: boolean) { // asset. setTokensIn([wrappedNativeAsset.value.address]); } else { - setTokensIn(joinTokensWithBalance.value); + setTokensIn(poolJoinTokens.value); } } @@ -150,19 +129,13 @@ onBeforeMount(() => { * WATCHERS */ watch( - [isSingleAssetJoin, joinTokensWithBalance], - ( - [isSingleAsset, newJoinTokensWithBalance], - [prevIsSingleAsset, prevJoinTokensWithBalance] - ) => { + [isSingleAssetJoin, poolJoinTokens], + ([isSingleAsset, newJoinTokens], [prevIsSingleAsset, prevJoinToken]) => { // Initialize token form if token balances change (ie. After investing, transaction confirmed or when account changes) // only if preview modal is not open if (!showPreview.value) { const hasTabChanged = prevIsSingleAsset !== isSingleAsset; - const hasUserTokensChanged = !isEqual( - prevJoinTokensWithBalance, - newJoinTokensWithBalance - ); + const hasUserTokensChanged = !isEqual(prevJoinToken, newJoinTokens); if (hasUserTokensChanged || hasTabChanged) { initializeTokensForm(isSingleAsset); } @@ -207,13 +180,6 @@ watch( @update:address="onTokenChange" /> - -
(); */ const { fNum } = useNumbers(); const { isWalletReady } = useWeb3(); +const { slippage } = useUserSettings(); const { highPriceImpact, @@ -24,6 +26,7 @@ const { priceImpact, supportsProportionalOptimization, fiatValueIn, + bptOut, } = useJoinPool(); const { @@ -60,7 +63,31 @@ const {
-
+
+
LP tokens
+
+
+ + {{ fNum(bptOut, FNumFormats.token) }} + + + + + + +
+
+
+
{{ $t('priceImpact') }}
@@ -134,7 +161,7 @@ const { @apply text-lg font-bold dark:bg-gray-800; } -.price-impact-row { +.secondary-row { @apply text-sm rounded-b-lg; } From 5f5f62632625cfa91d70407eb95a5986485a685f Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Tue, 6 Feb 2024 09:40:03 +0000 Subject: [PATCH 6/7] chore: bump sdk (dm) (#5220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Add 50BAL-50USDbC pool to base allowlist (#5136) Co-authored-by: balopco * 1.140.1 * chore: Add 50BAL-50USDbC pool to base allowlist (#5135) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.2 * chore: Add 50BALD-50USDC pool to base allowlist (#5134) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.3 * add stakable pools * 1.140.4 * chore: Add 50DAI-50USDbC pool to base allowlist (#5139) Co-authored-by: balopco * 1.140.5 * chore: Add wstETH/cbETH pool to arbitrum allowlist (#5143) Co-authored-by: balopco * 1.140.6 * chore: Add wstETH/sfrxETH pool to arbitrum allowlist (#5142) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.7 * chore: Add B-KAI-WETH-WEIGHTED pool to ethereum allowlist (#5141) Co-authored-by: balopco * 1.140.8 * chore: Add 50BAL-50USDC pool to base allowlist (#5137) Co-authored-by: balopco Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> * 1.140.9 * chore: Add rsETH / ETHx pool to ethereum allowlist (#5144) Co-authored-by: balopco * 1.140.10 * Added 80SYNO-20WETH pool to allowlist (#5148) * 1.140.11 * chore: Add B-kaiAURA-AURA-WEIGHTED pool to ethereum allowlist (#5149) Co-authored-by: balopco * 1.140.12 * chore: Add 50WETH-50USDbC pool to base allowlist (#5151) Co-authored-by: balopco * 1.140.13 * chore: Add 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5156) Co-authored-by: balopco * 1.140.14 * chore: Add 50USDT-50WXDAI pool to gnosis-chain allowlist (#5155) Co-authored-by: balopco * 1.140.15 * chore: Add 50WETH-50USDbC pool to base allowlist (#5154) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.16 * chore: Add 50BAL-50USDbC pool to base allowlist (#5150) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.17 * chore: Add 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5157) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.18 * chore: Add 15WMATIC-15WBTC-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol pool to polygon allowlist (#5158) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.19 * chore: Add 10WMATIC-20WBTC-10USDC-60STARV3-M/V-C8/StarSeeds_Protocol pool to polygon allowlist (#5159) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.20 * chore: Add 50WETH-50USDbC pool to base allowlist (#5152) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.21 * chore: Add 50WETH-50USDbC pool to base allowlist (#5153) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.22 * chore: Add branded redirects for gyro pools on ARB (#5163) * 1.140.23 * chore: init (#5133) * 1.140.24 * chore: Add vETH/wstETH pool to ethereum allowlist (#5170) Co-authored-by: balopco * 1.140.25 * chore: Add 20WETH-80ONDO pool to ethereum allowlist * chore: Add 50cbETH-50STG pool to base allowlist (#5167) Co-authored-by: balopco * 1.140.26 * chore: Add 50USDC-50axlUSDC pool to base allowlist (#5168) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.27 * chore: Add 50BAL-50USDC.e pool to arbitrum allowlist (#5169) Co-authored-by: balopco * 1.140.28 * chore: Add 50WBTC-50ARB pool to arbitrum allowlist (#5178) Co-authored-by: balopco * 1.140.29 * chore: Add 30USDC-70USDT pool to polygon allowlist (#5181) Co-authored-by: balopco * 1.140.30 * chore: Add new factory label (#5182) * 1.140.31 * chore: Add 50OLAS-50WETH pool to arbitrum allowlist (#5174) Co-authored-by: balopco Co-authored-by: Gareth Fuller * 1.140.32 * chore: Add ECLP-GHO-GYD pool to ethereum allowlist (#5175) Co-authored-by: balopco * 1.140.33 * chore: Init (#5171) * 1.140.34 * vETH-wstETH-Stakeable Adds to stakeable list for 3rd party rewards. * 1.140.35 * chore: Add 25oRETRO-25SP-25STARV3-25STARV3-M pool to polygon allowlist (#5187) Co-authored-by: balopco * 1.140.36 * chore: Add 5wstETH-15WMATIC-5oRETRO-5stMATIC-60SP-10WETH/V-SCM28/StarSeeds_Protocol pool to polygon allowlist (#5188) Co-authored-by: balopco * 1.140.37 * chore: Add VEC/pSVEC pool to ethereum allowlist (#5189) Co-authored-by: balopco * 1.140.38 * cbETH-rETH-wstETH-Arbitrum-Allowlist Adds the new cbETH/rETH/wstETH pool to the allowlist on arbitrum, meant to make the upcoming migration smoother when we align with rocket team on executing it. * 1.140.39 * chore: Add 20DE-80STARV3/V-VR/StarSeeds_Protocol pool to polygon allowlist (#5193) Co-authored-by: balopco * 1.140.40 * chore: Add // AURA/WETH pool to optimism allowlist * 1.140.41 * chore: Bump SDK (#5185) * 1.140.42 * chore: Add 50USDbC-50axlUSDC pool to base allowlist (#5196) Co-authored-by: balopco * 1.140.43 * chore: Add 10WMATIC-10WBTC-10USDC-10WETH-40STARV3-20STARV3-M/V-R45/StarSeeds_Protocol pool to polygon allowlist (#5203) Co-authored-by: balopco * 1.140.44 * chore: Add 50USDC-50sFRAX pool to arbitrum allowlist (#5204) Co-authored-by: balopco * 1.140.45 * chore: Add 10WMATIC-30oRETRO-60SP/V-VGR39/StarSeeds_Protocol pool to polygon allowlist (#5190) Co-authored-by: balopco Co-authored-by: Alberto Gualis * chore: Add 6wstETH-16WMATIC-8WBTC-8oRETRO-6stMATIC-8SP-8WETH-40STARV3/V-R44/StarSeeds_Protocol pool to polygon allowlist (#5201) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.46 * chore: Add 20BAL-80TEL pool to polygon allowlist (#5197) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.47 * chore: Add 80TEL-20WETH pool to polygon allowlist (#5198) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.48 * chore: Add 80TEL-20WBTC pool to polygon allowlist (#5199) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.49 * chore: Add 80TEL-20WMATIC pool to polygon allowlist (#5200) Co-authored-by: balopco Co-authored-by: Alberto Gualis * 1.140.50 * chore: Add USX/USDC BPT pool to arbitrum allowlist * chore: Add 80TEL-20USDC pool to polygon allowlist (#5202) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.51 * chore: Add 20oRETRO-20SP-50STARV3-10STARV3-M/V-EV3.4/StarSeeds_Protocol pool to polygon allowlist (#5212) Co-authored-by: balopco * 1.140.52 * chore: Add 34oRETRO-66SP/V-VR19/StarSeeds_Protocol pool to polygon allowlist (#5211) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.53 * chore: Add 40SP-40STARV3-20liveRetro/V-VR6/StarSeeds_Protocol pool to polygon allowlist (#5213) Co-authored-by: balopco Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> * 1.140.54 * chore: Add 50wstETH-50rETH pool to ethereum allowlist (#5210) Co-authored-by: balopco * 1.140.55 * 1.140.56 * Update pools.ts * Update pools.ts * 1.140.57 * chore: bump sdk --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: balopco Co-authored-by: Automated Version Bump Co-authored-by: Alberto Gualis Co-authored-by: ZeKraken <79888567+zekraken-bot@users.noreply.github.com> Co-authored-by: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Co-authored-by: Tritium <11885129+Tritium-VLK@users.noreply.github.com> Co-authored-by: Krzysztof Cywiński Co-authored-by: jogeorgeou Co-authored-by: Tritium-VLK --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- src/lib/config/arbitrum/pools.ts | 4 ++++ src/lib/config/base/pools.ts | 1 + src/lib/config/mainnet/pools.ts | 9 +++++++++ src/lib/config/optimism/pools.ts | 1 + src/lib/config/polygon/pools.ts | 14 ++++++++++++++ src/lib/config/zkevm/pools.ts | 1 + 8 files changed, 41 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 003b0b2747..7db11f577d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.30", + "version": "1.140.57", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.140.30", + "version": "1.140.57", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.6-beta.11", + "@balancer-labs/sdk": "^1.1.6-beta.14", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", @@ -1602,9 +1602,9 @@ } }, "node_modules/@balancer-labs/sdk": { - "version": "1.1.6-beta.11", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.6-beta.11.tgz", - "integrity": "sha512-TzXnbRqIphE+lRPHach2upMQbBZ2B7LASMJ2VpLzfz7pozazq9uh4cSvt552KVFTcocsRWvTFcKyjNhRBSHlHg==", + "version": "1.1.6-beta.14", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.6-beta.14.tgz", + "integrity": "sha512-JY5NPNdc/0/ne8xLhO0+IWUWd7ohetwRjQsogil6FA6cEEP0szNZG0u52IXTE4r5uemTmJXr3qGdl11uhBd8hw==", "dev": true, "dependencies": { "@balancer-labs/sor": "^4.1.1-beta.16", @@ -29796,9 +29796,9 @@ } }, "@balancer-labs/sdk": { - "version": "1.1.6-beta.11", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.6-beta.11.tgz", - "integrity": "sha512-TzXnbRqIphE+lRPHach2upMQbBZ2B7LASMJ2VpLzfz7pozazq9uh4cSvt552KVFTcocsRWvTFcKyjNhRBSHlHg==", + "version": "1.1.6-beta.14", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.6-beta.14.tgz", + "integrity": "sha512-JY5NPNdc/0/ne8xLhO0+IWUWd7ohetwRjQsogil6FA6cEEP0szNZG0u52IXTE4r5uemTmJXr3qGdl11uhBd8hw==", "dev": true, "requires": { "@balancer-labs/sor": "^4.1.1-beta.16", diff --git a/package.json b/package.json index 79b231272c..c5f4ae4364 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.30", + "version": "1.140.57", "engines": { "node": "=16", "npm": ">=8" @@ -41,7 +41,7 @@ "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.6-beta.11", + "@balancer-labs/sdk": "^1.1.6-beta.14", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", diff --git a/src/lib/config/arbitrum/pools.ts b/src/lib/config/arbitrum/pools.ts index e3a341ebcf..7cb017414b 100644 --- a/src/lib/config/arbitrum/pools.ts +++ b/src/lib/config/arbitrum/pools.ts @@ -78,6 +78,8 @@ const pools: Pools = { '0xd0ec47c54ca5e20aaae4616c25c825c7f48d40690000000000000000000004ef', // rETH/wETH BPT '0xc2598280bfea1fe18dfcabd21c7165c40c6859d30000000000000000000004f3', // wstETH/sfrxETH '0x6fe0e32081460d0e4469e36595e32c0f343a0e9c0000000000000000000004f4', // wstETH/cbETH + '0x2d6ced12420a9af5a83765a8c48be2afcd1a8feb000000000000000000000500', // cbETH/rETH/wstETH + '0x99d85550623b249c54ee6e7f42861dcefa3ee8d7000000000000000000000503', // USX/USDC BPT ], }, Investment: { @@ -168,7 +170,9 @@ const pools: Pools = { '0x3e5fb03652f40b6c5a30d0c0ec38cc065332dc4d0002000000000000000004f2', // 50BAL-50ARB '0xeb3e64ad9314d20bf943ac72fb69f272603f9cce0002000000000000000004f5', // 80SYNO-20WETH '0x60b3831cc85f4166f1dc3390be944a0818197bf20002000000000000000004fa', // 50BAL-50USDC.e + '0xaf8912a3c4f55a8584b67df30ee0ddf0e60e01f80002000000000000000004fc', // 50OLAS-50WETH '0x9fe9ee7c16d7569f31385611ef2f6d08a470fdab0002000000000000000004fe', // 50WBTC-50ARB + '0xbeb9ff5846e677366efef81761f2b9ecc0ff2703000200000000000000000501', // 50USDC-50sFRAX ], }, Factories: { diff --git a/src/lib/config/base/pools.ts b/src/lib/config/base/pools.ts index 554f9003b5..16ab70eba5 100644 --- a/src/lib/config/base/pools.ts +++ b/src/lib/config/base/pools.ts @@ -170,6 +170,7 @@ const pools: Pools = { '0x77bdaece95a25f28e1598f4126f8257ae2b8b09f0002000000000000000000ec', // 50WETH-50USDbC '0xc3f181b99d72697c8fa28bb7116d8eb3b1e617cf0002000000000000000000f1', // 50USDC-50axlUSDC '0x58916cf9bab42b062277910c6a51642cd60798e70002000000000000000000f0', // 50cbETH-50STG + '0x79776bc02521019e91302d683c3227c21a406c4c0002000000000000000000f2', // 50USDbC-50axlUSDC ], }, Factories: { diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index 949dda5cf7..8de2efa583 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -263,6 +263,9 @@ const pools: Pools = { '0x69d6e9636df140440eca285acc1f6c097aa57beb00020000000000000000065c', // B-KAI-WETH-WEIGHTED '0x0560e7e02cd054055d535c3c2b59baf565c6899b00020000000000000000065f', // B-kaiAURA-AURA-WEIGHTED '0x98b76fb35387142f97d601a297276bb152ae8ab0000200000000000000000662', // 20WETH-80ONDO + '0xaa7a70070e7495fe86c67225329dbd39baa2f63b000200000000000000000663', // ECLP-GHO-GYD + '0xa1e81ac3450edc5d0fa9c22addf7350f6a054daa000200000000000000000666', // VEC/pSVEC + '0xbb5820734d6d1623c1a8b39c848bcfb1417bac19000200000000000000000667', // 50wstETH-50rETH ], }, Factories: { @@ -481,6 +484,11 @@ const pools: Pools = { '0xa2e9242163d54b536583368a01b5d232c95aa884000000000000000000000653', '0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659', '0x383e7859271b2d0589b013b6d944572a0a8be3cb000000000000000000000657', + '0x3932b187f440ce7703653b3908edc5bb7676c283000200000000000000000664', + '0x99e7b15df044e1b62e2e1774fd4469d54d9409ac00020000000000000000065a', + '0xaa7a70070e7495fe86c67225329dbd39baa2f63b000200000000000000000663', + '0xd3f8ab9c5928fdf53153e7757131ad7815fe3146000000000000000000000661', + '0x7761b6e0daa04e70637d81f1da7d186c205c2ade00000000000000000000065d', ], AllowList: [ '0x54ca50ee86616379420cc56718e12566aa75abbe000200000000000000000610', // wusdm/wsteth @@ -493,6 +501,7 @@ const pools: Pools = { '0xb06bfbd7b50f80c8d9da57fc4cf5cbd5b3e2f14800000000000000000000064d', // pxETH/frxETH '0x49cbd67651fbabce12d1df18499896ec87bef46f00000000000000000000064a', // sDAI/[USDC/USDT/DAI] '0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659', // ezETH/WETH + '0xd3f8ab9c5928fdf53153e7757131ad7815fe3146000000000000000000000661', // vETH/wstETH ], }, Metadata: {}, diff --git a/src/lib/config/optimism/pools.ts b/src/lib/config/optimism/pools.ts index 0470a5061c..930993ef30 100644 --- a/src/lib/config/optimism/pools.ts +++ b/src/lib/config/optimism/pools.ts @@ -47,6 +47,7 @@ const pools: Pools = { '0x0244b0025264dc5f5c113d472d579c9c994a59ce0002000000000000000000c9', // PSP/OP '0x2a5139cd86c041aa3467e649f5ee0880a5de2f2f00020000000000000000011a', '0x2feb76966459d7841fa8a7ed0aa4bf574d6111bf00020000000000000000011d', + '0x2f6b6973f38381fe453ea819b7e0f0897adeaae7000200000000000000000113', // // AURA/WETH ], }, Factories: { diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index e97e4c9d43..8ca4a76410 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -482,6 +482,20 @@ const pools: Pools = { '0x4fb042c8ef4484f5d16b4450a0a5fae08334dc66000100000000000000000db3', // 15WMATIC-20SP-15WETH-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol '0xa8d0f5db2c67253b75c1b348a9767184e21930ec000100000000000000000db2', // 15WMATIC-15oRETRO-20SP-30STARV3-20STARV3-M/V-EV3.1/StarSeeds_Protocol '0xf4a88e05705ed34eb8f377db8a6dd56a1c77c33b000200000000000000000db6', // 30USDC-70USDT + '0x8bea6aa483a787e6c5b994db1811f458637a0071000100000000000000000db7', // 25oRETRO-25SP-25STARV3-25STARV3-M + '0x1ed031beb9eea8f2138fc60e0ed521d5c7771be3000100000000000000000db8', // 5wstETH-15WMATIC-5oRETRO-5stMATIC-60SP-10WETH/V-SCM28/StarSeeds_Protocol + '0x95c89c796ee66c9a2e15c1ae6ec42f101d2d44dc000100000000000000000db9', // 10WMATIC-30oRETRO-60SP/V-VGR39/StarSeeds_Protocol + '0x5ada63b2112f4299199ee9cc2bf632dfe37c2058000200000000000000000dba', // 20DE-80STARV3/V-VR/StarSeeds_Protocol + '0x3bd8a254163f8328efcc4f8c36da566753462433000200000000000000000dc1', // 80TEL-20USDC + '0x19127998126b6c7d32d596ee15d32719b1789c8e000200000000000000000dbf', // 80TEL-20WMATIC + '0xe1e09ce7aac2740846d9b6d9d56f588c65314ecb000200000000000000000dbe', // 80TEL-20WBTC + '0xca6efa5704f1ae445e0ee24d9c3ddde34c5be1c2000200000000000000000dbd', // 80TEL-20WETH + '0xa0ef0f4f24662050b7e504d1015a8cd7d2a8a51f000200000000000000000dbc', // 20BAL-80TEL + '0x061dffa319c0ff4a97eaaccdb723cf4f7513ca02000100000000000000000dc0', // 6wstETH-16WMATIC-8WBTC-8oRETRO-6stMATIC-8SP-8WETH-40STARV3/V-R44/StarSeeds_Protocol + '0xc7c09bd12aa00099d45e350e4b2d9b082a374aac000100000000000000000dc2', // 10WMATIC-10WBTC-10USDC-10WETH-40STARV3-20STARV3-M/V-R45/StarSeeds_Protocol + '0xeb51266192adcc8eadab4357ce4f8fc97b5ffc64000100000000000000000dc7', // 40SP-40STARV3-20liveRetro/V-VR6/StarSeeds_Protocol + '0xd819064c12ec65b7dffacbb4986059272e5e527e000200000000000000000dc5', // 34oRETRO-66SP/V-VR19/StarSeeds_Protocol + '0x173f7cf0b29b1178b64aa9c0ebdcec5955c61f6b000100000000000000000dc6', // 20oRETRO-20SP-50STARV3-10STARV3-M/V-EV3.4/StarSeeds_Protocol ], }, Factories: { diff --git a/src/lib/config/zkevm/pools.ts b/src/lib/config/zkevm/pools.ts index 9a44b7d9e9..4e3bec5568 100644 --- a/src/lib/config/zkevm/pools.ts +++ b/src/lib/config/zkevm/pools.ts @@ -80,6 +80,7 @@ const pools: Pools = { '0x6f34a44fce1506352a171232163e7716dd073ade000200000000000000000015', '0xb1557cfea06de5a1601a7f0ccf3b515ef431a50d000200000000000000000059', '0x65da876a95cd5b6a5880710628c436409b1b29fa00000000000000000000005b', + '0xffc865fcb34e754fad4b0144139b9c28c81c3eff00000000000000000000005f', ], AllowList: [ '0x195def5dabc4a73c4a6a410554f4e53f3e55f1a900010000000000000000000a', From edaef7c790ed388208f267aaafa1b5e222b606fe Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Mon, 12 Feb 2024 11:05:56 +0000 Subject: [PATCH 7/7] 1.141.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 d18ce86358..055599267d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.88", + "version": "1.141.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.140.88", + "version": "1.141.0", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index c75d4474cd..07ccc34291 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.140.88", + "version": "1.141.0", "engines": { "node": "=16", "npm": ">=8"