Skip to content

Commit

Permalink
Merge pull request #4660 from balancer/release/1.133.0
Browse files Browse the repository at this point in the history
Release 1.133.0 (dm)
  • Loading branch information
garethfuller authored Nov 20, 2023
2 parents b7db50e + 0b0b731 commit 08d12b7
Show file tree
Hide file tree
Showing 10 changed files with 144 additions and 182 deletions.
276 changes: 98 additions & 178 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.132.22",
"version": "1.133.0",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down Expand Up @@ -88,7 +88,7 @@
"@typescript-eslint/eslint-plugin": "^5.48.1",
"@typescript-eslint/parser": "^5.48.1",
"@vitejs/plugin-vue": "^4.1.0",
"@vitest/coverage-c8": "^0.30.1",
"@vitest/coverage-v8": "^0.34.6",
"@vue/test-utils": "^2.4.1",
"@vueuse/core": "^4.3.4",
"@walletconnect/ethereum-provider": "^2.10.2",
Expand Down
3 changes: 3 additions & 0 deletions src/composables/queries/useUserPoolSharesQuery.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import useUserPoolSharesQuery from '@/composables/queries/useUserPoolSharesQuery';
import { initDependenciesWithDefaultMocks } from '@/dependencies/default-mocks';
import { mountComposable, waitForQueryData } from '@tests/mount-helpers';
import { defaultPoolBalance } from '@tests/msw/graphql-handlers';

initDependenciesWithDefaultMocks();

test('Returns pool shares for the current user', async () => {
const { result } = mountComposable(() => useUserPoolSharesQuery());

Expand Down
6 changes: 4 additions & 2 deletions src/composables/useSlippage.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import useSlippage from './useSlippage';
import { mountComposable } from '@tests/mount-helpers';

vi.mock('@/providers/user-settings.provider');
// TODO: This line is causing flaky tests:
// TypeError: Cannot read properties of undefined (reading 'asyncTaskManager')
// vi.mock('@/providers/user-settings.provider');

describe('useSlippage', () => {
describe.skip('useSlippage', () => {
const { result } = mountComposable(() => useSlippage());

it('Should load', () => {
Expand Down
6 changes: 6 additions & 0 deletions src/lib/config/arbitrum/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const pools: Pools = {
'0x3f09c77b19ad8bb527355ec32d5ce98421fec2e30000000000000000000004b2', // axlBAL/BAL
'0xe6d48f62a7d87e6bd13c283ca55068f0a73e6a5f0000000000000000000004cc', // USDV/FRAX
'0xe6fcb0ac7e05196b0870ae2aeb80dc9079ee1a250000000000000000000004cb', // USDV/USDC
'0xef093ccfdd4d5a590b028463e0528049939889c90000000000000000000004cf', // SWEEP/USDC
],
},
Investment: {
Expand Down Expand Up @@ -134,6 +135,9 @@ const pools: Pools = {
'0x32b1d14c6c31dff0407058586a01614da686dfcc0001000000000000000004ce', // 10BAL-20CRV-20SUSHI-25UNI-25GMX
'0xb52bd7459cb4754ec30e5b0691574159fb0812170002000000000000000004cd', // 50USDC-50USDT
'0x965353ce4d898e5367d0cdfefb5df1f0dca726690001000000000000000004ca', // 67BAL-29WBTC-4wstETH
'0x0755c402ef855046a43459827771147c964a798f0002000000000000000004d2', // 50wstETH-50USDC
'0x21841e071de6da9cc0c2927ffbd91469b390add10001000000000000000004d1', // 40WBTC-40WETH-204POOL-BPT
'0x9d8dc132625a131dc80ccf49ed9e9998f041a5870001000000000000000004d0', // 25BAL-25AURA-25wstETH-25ARB
],
},
Factories: {
Expand Down Expand Up @@ -227,6 +231,7 @@ const pools: Pools = {
],
AllowList: [
'0x88e2c969e2a1c69c16d1dcd9f8acde4c6ab3838a0002000000000000000004c1',
'0xa1a8bf131571a2139feb79401aa4a2e9482df6270002000000000000000004b4',
],
},
Metadata: {},
Expand All @@ -250,6 +255,7 @@ const pools: Pools = {
'0x00fcd3d55085e998e291a0005cedecf58ac14c4000020000000000000000047f', // 50STG-50bbaUSD
'0xa1ea76c42b2938cfa9abea12357881006c52851300000000000000000000048f', // DUSD/bbausd
'0x3cdf30e36154a66a4478e15ed41659b5bb0738f100000000000000000000049b', // DUSD-4POOL-BPT
'0xa1a8bf131571a2139feb79401aa4a2e9482df6270002000000000000000004b4',
],
Deprecated: {
'0x567ecfcb22205d279bb8eed3e066989902bf03d5000000000000000000000452': {
Expand Down
5 changes: 5 additions & 0 deletions src/lib/config/base/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const pools: Pools = {
'0x0c659734f1eef9c63b7ebdf78a164cdd745586db000000000000000000000046', // USDC/USDbC/axlUSDC
'0x58f2110b61f97fd6b9200b038d92f17c722a5a3300000000000000000000004f', // axlBAL/BAL
'0x30722f57d56037caa2c38abd1f5e2955814875e9000000000000000000000087', // axlETH/ETH
'0x0c316e55f987ef2d467f18852301492bca7e8a690000000000000000000000bc', // USDbC/tUSDbC
'0x15d9d108437b17d1fa70392f9ed086306229ec910000000000000000000000bf', // SWEEP-USDC-BPT
],
},
Investment: {
Expand Down Expand Up @@ -133,6 +135,9 @@ const pools: Pools = {
'0xee94d8df3ecf9158d1cd3d752c7b61fc4fd46b120002000000000000000000b8', // 50WETH-50USDbC
'0xa1d5264a2d3e2652756993c29729e092ca91d0d40001000000000000000000b9', // 40cbETH-40WETH-20rETH
'0x06eaace423af9a6bf6268d0421ac0e0b94c879460002000000000000000000ba', // 20WETH-80TAG
'0x87646430235a2b1ab9366f424750e778991047a10002000000000000000000bd', // 50DAI-50USDC
'0x64fcbd882d7de9d4dd1fa670c3f1ea15f324baf40002000000000000000000be', // 50DAI-50USDbC
'0x9d884e09e0ddf816a1b3f31ccd94a0319793b11b0001000000000000000000c1', // 33BAL-33WETH-33USDC
],
},
Factories: {
Expand Down
4 changes: 4 additions & 0 deletions src/lib/config/mainnet/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ const pools: Pools = {
'0xdd36fda7329291db8666540186cb36fcf0e36eac000000000000000000000612', // sDAI/DOLA
'0x3de1b8854ec4f1a6e45fc56b8008abb14eb103fb00000000000000000000061f', // USDV/sDAI
'0x9ca0ffcbae87a66a8f4604bfec724da04e2474ae000000000000000000000621', // USDV/USDC
'0xa468570db143321bc034bbd74a6cc2694d15b252000000000000000000000629', // SWEEP-USDC-BPT
'0xb9debddf1d894c79d2b2d09f819ff9b856fca55200000000000000000000062a', // weETH-WETH-BPT
],
},
Investment: {
Expand Down Expand Up @@ -231,6 +233,8 @@ const pools: Pools = {
'0x5b3b589b45531a2f0ae203d5044782ba46aefc4c00010000000000000000061a', // 17DNT-17CVC-17OCEAN-17POLY-17USDC-17ENJ
'0x58b645fa247b60f2cb896991fd8956146c9fcb4a00020000000000000000061d', // 80mevETH/20FOLD
'0x7056c8dfa8182859ed0d4fb0ef0886fdf3d2edcf000200000000000000000623', // 80OETH/20WETH
'0xce8d4ad8cce1240ecbc49385baf4c399a7f353f9000200000000000000000628', // BAL-20WETH-80VCX
'0x82b8c7c6fb62d09cfd004309c1f353fb1a926edc000200000000000000000626', // EPOCH-LP
],
},
Factories: {
Expand Down
1 change: 1 addition & 0 deletions src/lib/config/optimism/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const pools: Pools = {
'0xacfe9b4782910a853b68abba60f3fd8049ffe6380000000000000000000000ff', // USDC/DOLA
'0x004700ba0a4f5f22e1e78a277fca55e36f47e09c000000000000000000000104', // rEth/ankrEth
'0x9da11ff60bfc5af527f58fd61679c3ac98d040d9000000000000000000000100', // usdc/usdcE/usdt/dai
'0xc4ee406970047a70aed14621d97b3b460a7dea0b00000000000000000000010b', // SWEEP/USDC
],
},
Investment: {
Expand Down
18 changes: 18 additions & 0 deletions src/lib/config/polygon/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,24 @@ const pools: Pools = {
'0x0d8573d0b4542797be945f741cb8e6b7117dc751000100000000000000000c8b', // STARV3-XTETUBAL-BALWETH-USDC/Arbitrage/StarSeeds_Protocol
'0x2d753d4ebf91b137b161b69bdb8638cf4b80c4a5000200000000000000000c8d', // 50fireEP-50ICHI_Vault_LP
'0x0abc5370a1bced0e78222dba60ca69189aad7ed9000200000000000000000c8c', // STARV3-XTETUBAL-BALWETH/Arbitrage/StarSeeds_Protocol
'0xdcd3fc34d581ee474520b0f6bce9412df7d2e32f000200000000000000000c90', // 95DE-5DAI
'0x4d1249c87e451de44b5bd7d4f17b2d333b3c3723000200000000000000000c92', // STARV3-xtetuBAL-BALWETH/50-50/StarSeeds_Protocol
'0xeba5452e53293d195bf436dc53750c594504b34e000200000000000000000c93', // STARV3-tetuBAL-BALWETH/50-50/StarSeeds_Protocol
'0x8d95d14a46b2c535494e725e532b3756e9026c72000200000000000000000c95', // STARV3-FBX/50-50/StarSeeds_Protocol
'0x88b657ce391a034939e86d0698574c6b3a3e6365000200000000000000000c96', // STARV3-ICHI_Vault_LP/50-50/StarSeeds_Protocol
'0x9c57dc0639523e7cc1dba4846d17d3f31d12f45a000200000000000000000c97', // STARV3-fireEP/50-50/StarSeeds_Protocol
'0x91c22f98d8ca24a86a443c122c484ff91e38835b000200000000000000000c98', // STARV3-wstETH/50-50/StarSeeds_Protocol
'0x1ae0ae6917f52a40748142f0373859e9635d3396000200000000000000000c99', // STARV3-STARV2/30-70/StarSeeds_Protocol
'0xda53afe8ca5f935e19d1af46d7524460cea09862000200000000000000000c9a', // pStorage
'0xd2ad70856dab2b68a9c43f63e2211053c2232c31000200000000000000000c9b', // 50GRT-50wPPC
'0xdc7623c2c091c8f1f180a20de6443cfe4a8e7da7000200000000000000000c91', // 50GRT-50wPPC
'0xaea9eac8fc07ed24502270d59fa41c03575758bb000200000000000000000c9c', // 50USDC-50wPPC
'0x51a7c7be986f890faa9de665a8fd7f4d9398d9a1000200000000000000000c9e', // liveRetro-WMATIC/50-50/StarSeeds_Protocol
'0x8ea81c2c0dcd0baf5ecbbc2dec334ebd56dec545000200000000000000000c9d', // STARV3-MAI/88-12/StarSeeds_Protocol
'0x0156e921739ac090c3717e84d78b64bd08ea94ca000200000000000000000ca0', // STARV3-liveRetro/40-60/StarSeeds_Protocol
'0xe2b1b8ae0a5440ee91ebd586506fbb4c0a8500bd000200000000000000000ca1', // oRETRO-WMATIC/50-50/StarSeeds_Protocol
'0x17a00f034836c7a9c666cd46086713af3b58a9a5000200000000000000000ca2', // STARV3-oRETRO/40-60/StarSeeds_Protocol
'0xda2e07ae9111821dea416ea1fbdaf4d2bd407fbc000200000000000000000ca3', // 50WMATIC-50wPPC
],
},
Factories: {
Expand Down
3 changes: 3 additions & 0 deletions tests/mount-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ import { registerTestPlugins } from './registerTestPlugins';
import { DeepPartial } from './unit/types';
import { Router } from 'vue-router';
import { provideUserData } from '@/providers/user-data.provider';
import { initOldMulticallerWithDefaultMocks } from '@/dependencies/OldMulticaller.mocks';

export const defaultStakedShares = '5';

initOldMulticallerWithDefaultMocks();

export function provideFakePoolStaking(stackedShares = defaultStakedShares) {
provide(PoolStakingProviderSymbol, {
stakedShares: computed(() => stackedShares),
Expand Down

1 comment on commit 08d12b7

@vercel
Copy link

@vercel vercel bot commented on 08d12b7 Nov 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.