Skip to content

Commit

Permalink
Brings last master changes into develop (#4764)
Browse files Browse the repository at this point in the history
* chore: Add STARV3-DYST/60-40/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-tetuQI/Test/StarSeeds_Protocol pool to polygon allowlist

* 1.134.1

* 1.134.2

* chore: Add STARV3-M-wstETH-ETH/80-20/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-M-tetuQi/60-40/StarSeeds_Protocol pool to polygon allowlist

* 1.134.3

* 1.134.4

* chore: Add STARV3-STARV3-M/30-70/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-M-vQi/60-40/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-M-st/WMATIC(C)/80-20/StarSeeds_Protocol pool to polygon allowlist

* chore: Add DAO-WBTC/80-20/StarSeeds_Protocol pool to polygon allowlist

* chore: Add DAO-st/WMATIC(C)/80-20/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-DAO-STARV3-M/30-28-42/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-vQi/60-40/StarSeeds_Protocol pool to polygon allowlist

* 1.134.5

* 1.134.6

* 1.134.7

* 1.134.8

* 1.134.9

* 1.134.10

* 1.134.11

* chore: Add STARV3-M-DAO-STARV2-st/WMATIC(C)/33-22-30-15/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-M-DAO-STARV2-wstETH-ETH(C)/40-25-20-15/StarSeeds_Protocol pool to polygon allowlist

* chore: Add STARV3-M-STARV2-tetuQi-vQi-oRetro-liveRetro-st/WMATIC(C)-wstETH-ETH(C)-30-30-10-10-5x4/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 25WBTC-25mooCompoundPolygonUSDC-25ICHI_Vault_LP-25ICHI_Vault_LP pool to polygon allowlist

* 1.134.12

* 1.134.13

* Remove pool from allowlist as it was replaced by a new one

* 1.134.14

* 1.134.15

* 1.134.16

* Skip flaky test

* 1.134.17

* chore: Add plsRDNT-Stable pool to arbitrum allowlist (#4731)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.18

* chore: Support zkevm veBAL sync (#4739)

* chore: Support veBAL sync for zkevm

* Fix tests

---------

Co-authored-by: Alberto Gualis <[email protected]>

* Deploy (#4741)

* chore: empty commit to trigger deployment (#4742)

* Empty commit to trigger deployment

* Fix flaky tests (#4743)

* Delete flaky test

* 1.134.19

* chore: Add osETH/wETH-BPT pool to ethereum allowlist (#4744)

Co-authored-by: balopco <[email protected]>

* 1.134.20

* add new stakable pool

* 1.134.21

* chore: Add STARV3-tetuQi-STARV3-M/30-20-50/StarSeeds_Protocol pool to polygon allowlist (#4751)

Co-authored-by: balopco <[email protected]>

* 1.134.22

* chore: Add STARV3-M-miMATIC-STARV2/45-18-37/StarSeeds_Protocol pool to polygon allowlist (#4745)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.23

* chore: Add STARV3-oRETRO-st/MATIC(C)-wstETH-ETH(C)-STARV3-M/30-15-10-5-40/StarSeeds_Protocol pool to polygon allowlist (#4750)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.24

* chore: Add STARV3-liveRetro-STARV3-M/33-22-45/StarSeeds_Protocol pool to polygon allowlist (#4749)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.25

* chore: Add STARV3-oRETRO-STARV3-M/40-15-45/StarSeeds_Protocol pool to polygon allowlist (#4748)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.26

* chore: Add STARV3-vQi-STARV3-M/35-20-45/StarSeeds_Protocol pool to polygon allowlist (#4754)

Co-authored-by: balopco <[email protected]>

* 1.134.27

* chore: Add STARV2-wstETH-ETH(C)/80-20/StarSeeds_Protocol pool to polygon allowlist (#4752)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.28

* chore: Add STARV3-st/WMATIC(C)/80-20/StarSeeds_Protocol pool to polygon allowlist (#4753)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.29

* Make fixed osETH pool stakable

* chore: Add STARV3-RETRO/67-33/StarSeeds_Protocol pool to polygon allowlist (#4755)

Co-authored-by: balopco <[email protected]>

* 1.134.30

* add back pools

* chore: Add STARV2-st/WMATIC(C)/60-40/StarSeeds_Protocol pool to polygon allowlist (#4757)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.31

* chore: Add STARV2-DAO/60-40/StarSeeds_Protocol pool to polygon allowlist (#4756)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.134.32

* 1.134.33

* chore: Add STARV3-M-st/MATIC(C)-WBTC-wstETH-ETH(C)/40-20x3/StarSeeds_Protocol pool to polygon allowlist (#4763)

Co-authored-by: balopco <[email protected]>

* 1.134.34

---------

Co-authored-by: balopco <[email protected]>
Co-authored-by: Automated Version Bump <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Gareth Fuller <[email protected]>
Co-authored-by: ZeKraken <[email protected]>
Co-authored-by: Zen-Maxi <[email protected]>
Co-authored-by: BIP Bot <[email protected]>
  • Loading branch information
8 people authored Nov 30, 2023
1 parent 845c544 commit a5904fa
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 140 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.134.17",
"version": "1.134.34",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down
132 changes: 0 additions & 132 deletions src/components/contextual/pages/vebal/LMVoting/GaugesTable.spec.ts

This file was deleted.

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

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

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

it('Should load', () => {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/config/arbitrum/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const pools: Pools = {
'0xe6d48f62a7d87e6bd13c283ca55068f0a73e6a5f0000000000000000000004cc', // USDV/FRAX
'0xe6fcb0ac7e05196b0870ae2aeb80dc9079ee1a250000000000000000000004cb', // USDV/USDC
'0xef093ccfdd4d5a590b028463e0528049939889c90000000000000000000004cf', // SWEEP/USDC
'0x451b0afd69ace11ec0ac339033d54d2543b088a80000000000000000000004d5', // plsRDNT-Stable
],
},
Investment: {
Expand Down Expand Up @@ -235,6 +236,7 @@ const pools: Pools = {
AllowList: [
'0x88e2c969e2a1c69c16d1dcd9f8acde4c6ab3838a0002000000000000000004c1',
'0xa1a8bf131571a2139feb79401aa4a2e9482df6270002000000000000000004b4',
'0xdacf5fa19b1f720111609043ac67a9818262850c000000000000000000000635',
],
},
Metadata: {},
Expand Down
3 changes: 2 additions & 1 deletion src/lib/config/mainnet/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ const pools: Pools = {
'0xa468570db143321bc034bbd74a6cc2694d15b252000000000000000000000629', // SWEEP-USDC-BPT
'0xb9debddf1d894c79d2b2d09f819ff9b856fca55200000000000000000000062a', // weETH-WETH-BPT
'0x50359088f666a9e70dc00b565ecd9f853a572c7c00000000000000000000062e', // osETH-ETH BPT
'0xdacf5fa19b1f720111609043ac67a9818262850c000000000000000000000635', // osETH/wETH-BPT
],
},
Investment: {
Expand Down Expand Up @@ -461,7 +462,7 @@ const pools: Pools = {
AllowList: [
'0x54ca50ee86616379420cc56718e12566aa75abbe000200000000000000000610', // wusdm/wsteth
'0x9ca0ffcbae87a66a8f4604bfec724da04e2474ae000000000000000000000621', // usdv/usdc
'0x50359088f666a9e70dc00b565ecd9f853a572c7c00000000000000000000062e',
'0xdacf5fa19b1f720111609043ac67a9818262850c000000000000000000000635', // osETH/WETH
],
},
Metadata: {},
Expand Down
12 changes: 12 additions & 0 deletions src/lib/config/polygon/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,18 @@ const pools: Pools = {
'0xba92fdde8d27540d50dfff601b673bf8ef5614d0000100000000000000000cc8', // STARV3-M-DAO-STARV2-wstETH-ETH(C)/40-25-20-15/StarSeeds_Protocol
'0x8cff4f4ae0a3809ff91273bd0cd3e6805462d184000100000000000000000cca', // 25WBTC-25mooCompoundPolygonUSDC-25ICHI_Vault_LP-25ICHI_Vault_LP
'0xd041829822b8af6b199c9031a966184ecda086ce000100000000000000000cc7', // STARV3-M-DAO-STARV2-st/WMATIC(C)/33-22-30-15/StarSeeds_Protocol
'0xf313acc24aaa76af362ee4371251312cec90884d000100000000000000000ccc', // STARV3-oRETRO-STARV3-M/40-15-45/StarSeeds_Protocol
'0xc59e114c470c96da70f45e67583a25dca0dbc259000100000000000000000ccd', // STARV3-liveRetro-STARV3-M/33-22-45/StarSeeds_Protocol
'0x9a9563a975e8c61f60620971e10cc09eadc3716c000100000000000000000cce', // STARV3-oRETRO-st/MATIC(C)-wstETH-ETH(C)-STARV3-M/30-15-10-5-40/StarSeeds_Protocol
'0xfe0737e6e22f7e4c39c526a458e44f618af53b40000100000000000000000ccb', // STARV3-M-miMATIC-STARV2/45-18-37/StarSeeds_Protocol
'0x1cfb761fc8e626f83f4e4b235623029e8ca06a42000100000000000000000ccf', // STARV3-tetuQi-STARV3-M/30-20-50/StarSeeds_Protocol
'0xa326d263145bd9849698eee4e0669fc0dedbab70000200000000000000000cd1', // STARV3-st/WMATIC(C)/80-20/StarSeeds_Protocol
'0xb48f108dbd5122a59616db806de59bf347fe6369000200000000000000000cd0', // STARV2-wstETH-ETH(C)/80-20/StarSeeds_Protocol
'0x611ee2908ac1ee2ad84815d3d1489717d6050175000100000000000000000cd2', // STARV3-vQi-STARV3-M/35-20-45/StarSeeds_Protocol
'0x90dccf391004380bdafee7910cdd002b8c4de81d000200000000000000000cd4', // STARV2-DAO/60-40/StarSeeds_Protocol
'0x9eafd3b6d65b0d099747e2942eed730176068267000200000000000000000cd5', // STARV2-st/WMATIC(C)/60-40/StarSeeds_Protocol
'0xa500c998642f1eaa75b099faf381c6403d101cb7000200000000000000000cd3', // STARV3-RETRO/67-33/StarSeeds_Protocol
'0xe5ccde10aa827c643142ea85c3b8200eb1bf7c70000100000000000000000cd6', // STARV3-M-st/MATIC(C)-WBTC-wstETH-ETH(C)/40-20x3/StarSeeds_Protocol
],
},
Factories: {
Expand Down

1 comment on commit a5904fa

@vercel
Copy link

@vercel vercel bot commented on a5904fa Nov 30, 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.