Skip to content

Commit

Permalink
chore: master into develop (DM) (#3929)
Browse files Browse the repository at this point in the history 
* feat: add gyro card for pools on mainnet

* Add BETS to whitelisr

* 1.116.7

* 1.116.8

* 1.116.9

* Update pools.ts (#3808)

AllowList UAHT pools

* 1.116.10

* hotfix: Await nextTick before exiting pool (#3837)

* 1.116.11

* hotfix: mismatch network error (#3834)

* 1.116.12

* fix: Dont display withdrawals with preminted BPT (#3838)

* 1.116.13

* hotfix: Single asset exit options (#3839)

* fix: Dont display withdrawals with preminted BPT

* fix: Allow swap exits from composable pools that are not paused

* 1.116.14

* Hotfix: Merkle Orchard claiming (#3846)

* chore: Add buffer dep

* chore: Import deps required in claim.worker

* chore: Add comment

* 1.116.15

* chore: Add 50miMATIC-50USDT pool to polygon allowlist (#3845)

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

* 1.116.16

* add additional weekly voting gauges (#3849)

* 1.116.17

* add 80HATCHY-20WAVAX pool to allowlist on avalanche (#3850)

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

* 1.116.18

* chore: Add 80ASX-20WETH pool to mainnet allowlist (#3853)

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

* 1.116.19

* chore: Add DUSD/bbaUSD pool to polygon allowlist (#3844)

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

* 1.116.20

* chore: Add DUSD/bbaUSD pool to arbitrum allowlist (#3848)

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

* 1.116.21

* fix: bump-sdk to improve Avax routing (#3855)

* 1.116.22

* 1.117.0

* Base network promotion (#3859)

* base promo banner

* Updated promo banner, new badges, removed Avax

* Fixed padding

* Make factories lower case

* Add WETH/DAI to allowlist

---------

Co-authored-by: Tim Robinson <[email protected]>

* 1.117.1

* Add 3 pools to base staking list (#3861)

* 1.117.2

* chore: Add 50wstETH-50ARB pool to arbitrum allowlist (#3863)

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

* 1.117.3

* add metadata

* 1.117.4

* chore: Alternate between promos 50/50 (#3867)

* 1.117.5

* Hotfix: Wait for more confirmations on Ava and Base (#3869)

* 1.117.6

* chore: Use tenderly RPC for base (#3870)

* chore: Add 50wstETH-50ankrETH pool to arbitrum allowlist

* 1.117.7

* chore: Add 50ankrMATIC-50stMATIC pool to polygon allowlist

* chore: Catch ens failure (#3874)

* 1.117.8

* Hotfix: Add VotingEscrowDelegationProxy addresses for Base & Ava (#3878)

* 1.117.9

* chore: Add 50RDNT-50USDT pool to arbitrum allowlist

* add axlUSD to whitelist

* 1.117.10

* Add tetubal pool to whitelist (#3877)

* Add tetubal pool to whitelist

* Update pools.ts

* 1.117.11

* Add weighted OGRE80-WETH20 to allowlist (base chain)

* 1.117.12

* 1.117.13

* chore: Add 50WBTC-50MaticX pool to polygon allowlist

* 1.117.14

* chore: Add 50DAI-50miMATIC pool to polygon allowlist

* 1.117.15

* 1.117.16

* 1.117.17

* chore: Set forceMax to false for veBal approval

* 1.117.18

* Manual Allowlist Linu weth

* 1.117.19

* Add missing chains to allowlist script (#3895)

* 1.117.20

* chore: Add 50WETH/50USDbC pool to base allowlist

* 1.117.21

* chore: Add migration notice to polygon pool (#3900)

* 1.117.22

* adding btc to pool to stakable (#3899)

* 1.117.23

* fix bal claiming on zkevm

* fix: Set lower min tx buffers on L2s (#3906)

* 1.117.24

* Disable staking when there's no preferential gauge (#3910)

* 1.117.25

* chore: Add 50USDC-50USDT pool to mainnet allowlist (#3902)

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

* 1.117.26

* chore: Add 50somm-50WETH pool to mainnet allowlist (#3903)

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

* 1.117.27

* chore: Add 50bb-s-DAI-50bb-a-USD pool to mainnet allowlist (#3912)

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

* 1.117.28

* 1.117.29

* add axUSD to stakable (#3913)

* add axUSD to stakable

* Update pools.ts

* add dusd to metadata

* add DUSD to metadata

* add DUSD to deep

* 1.117.30

* chore: Add 20wstETH-50ETHx-20sfrxETH-10rETH pool to mainnet allowlist

* chore: Add 50bb-a-WETH-50YieldETH pool to mainnet allowlist

* 1.117.31

* 1.117.32

* fix: disable boosts in base

* 1.117.33

* add tbtc pools (#3920)

* 1.117.34

* add gold to base whitelist

* 1.117.35

* weekly gauges (#3923)

* 1.117.36

* hotfix: bump sdk (#3924)

* 1.117.37

* chore: Add 33WBTC-33WETH-33NEX pool to polygon allowlist (#3925)

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

* 1.117.38

* new gauge for this week

* 1.117.39

* update gauge list

* 1.117.40

---------

Co-authored-by: alter-eggo <[email protected]>
Co-authored-by: ZeKraken <[email protected]>
Co-authored-by: Automated Version Bump <[email protected]>
Co-authored-by: Tim Robinson <[email protected]>
Co-authored-by: starscrowding.com <[email protected]>
Co-authored-by: Gareth Fuller <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: balopco <[email protected]>
Co-authored-by: Asno <[email protected]>
Co-authored-by: asnogordo <[email protected]>
Co-authored-by: Tim Robinson <[email protected]>
Co-authored-by: pkattera <[email protected]>
Co-authored-by: Tritium <[email protected]>
Co-authored-by: BIP Bot <[email protected]>
Co-authored-by: Tritium-VLK <[email protected]>
Co-authored-by: Fábio Mendes <[email protected]>
Co-authored-by: Fábio Mendes <[email protected]>
  • Loading branch information
@agualis @alter-eggo
@zekraken-bot @timjrobinson @starscrowding @garethfuller @github-actions @balopco @pkattera @Tritium-VLK @mendesfabio
18 people authored Aug 10, 2023
1 parent fd56873 commit a28cd56
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 29 deletions.
34 changes: 17 additions & 17 deletions package-lock.json
View file

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

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.117.27",
"version": "1.117.40",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down Expand Up @@ -42,7 +42,7 @@
"devDependencies": {
"@aave/protocol-js": "^4.3.0",
"@balancer-labs/assets": "github:balancer-labs/assets#master",
"@balancer-labs/sdk": "^1.1.4-beta.8",
"@balancer-labs/sdk": "^1.1.4-beta.13",
"@balancer-labs/typechain": "^1.0.0",
"@balancer-labs/v2-deployments": "^3.2.0",
"@cowprotocol/contracts": "^1.3.1",
Expand Down
161 changes: 153 additions & 8 deletions src/data/voting-gauges.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2975,7 +2975,7 @@
]
},
"tokenLogoURIs": {
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://assets.coingecko.com/coins/images/29551/large/R_logo_CMC.png?1679621963",
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x183015a9ba6ff60230fdeadc3f43b3d788b13e21.png",
"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png"
}
},
Expand Down Expand Up @@ -3004,7 +3004,7 @@
]
},
"tokenLogoURIs": {
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://assets.coingecko.com/coins/images/29551/large/R_logo_CMC.png?1679621963",
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x183015a9ba6ff60230fdeadc3f43b3d788b13e21.png",
"0x6B175474E89094C44Da98b954EedeAC495271d0F": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
}
},
Expand Down Expand Up @@ -3352,7 +3352,7 @@
]
},
"tokenLogoURIs": {
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://assets.coingecko.com/coins/images/29551/large/R_logo_CMC.png?1679621963",
"0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x183015a9ba6ff60230fdeadc3f43b3d788b13e21.png",
"0x2B218683178d029BAB6c9789b1073aA6c96E5176": ""
}
},
Expand Down Expand Up @@ -3954,6 +3954,35 @@
"0x98E86Ed5b0E48734430BfBe92101156C75418cad": ""
}
},
{
"address": "0x2Dc55e84bAF47296c2cf87B4eC3eb66fD7665611",
"network": 1,
"isKilled": false,
"relativeWeightCap": "0.02",
"addedTimestamp": 1691432951,
"pool": {
"id": "0x26cc136e9b8fd65466f193a8e5710661ed9a98270002000000000000000005ad",
"address": "0x26Cc136e9b8FD65466F193a8e5710661Ed9A9827",
"poolType": "Weighted",
"symbol": "80BETS/20wstETH",
"tokens": [
{
"address": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
"weight": "0.2",
"symbol": "wstETH"
},
{
"address": "0x94025780a1aB58868D9B2dBBB775f44b32e8E6e5",
"weight": "0.8",
"symbol": "BETS"
}
]
},
"tokenLogoURIs": {
"0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0.png",
"0x94025780a1aB58868D9B2dBBB775f44b32e8E6e5": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x94025780a1ab58868d9b2dbbb775f44b32e8e6e5.png"
}
},
{
"address": "0xf0f572ad66baacDd07d8c7ea3e0E5EFA56a76081",
"network": 5,
Expand Down Expand Up @@ -5604,6 +5633,64 @@
"0x25e57F4612912614e6C99616Bd2aBB9b5Ae71E99": ""
}
},
{
"address": "0x5c0e6d132C53DA7F6e958EdF13db0FA02C5b2eC6",
"network": 137,
"isKilled": false,
"relativeWeightCap": "1",
"addedTimestamp": 1691432951,
"pool": {
"id": "0x2645b13fd2c5295296e94a76280b968bdcbbdfed000000000000000000000c11",
"address": "0x2645B13FD2c5295296e94A76280B968bDcbbDfED",
"poolType": "ComposableStable",
"symbol": "DUSD/bbaUSD",
"tokens": [
{
"address": "0x03090a9811181A2AfE830a3a0B467698CcF3a8b1",
"weight": "null",
"symbol": "bb-am-usd"
},
{
"address": "0xEC38621e72D86775a89C7422746de1f52bbA5320",
"weight": "null",
"symbol": "DUSD"
}
]
},
"tokenLogoURIs": {
"0x03090a9811181A2AfE830a3a0B467698CcF3a8b1": "",
"0xEC38621e72D86775a89C7422746de1f52bbA5320": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xec38621e72d86775a89c7422746de1f52bba5320.png"
}
},
{
"address": "0x317e4966AE76fBf5110D2412c0c9332047399643",
"network": 137,
"isKilled": false,
"relativeWeightCap": "0.02",
"addedTimestamp": 1691432951,
"pool": {
"id": "0x42942cdec85078cf0e28e9cb5acd40cb53997ed6000000000000000000000bea",
"address": "0x42942cDeC85078Cf0e28e9CB5ACd40CB53997Ed6",
"poolType": "ComposableStable",
"symbol": "2BRL (BRZ)",
"tokens": [
{
"address": "0x4eD141110F6EeeAbA9A1df36d8c26f684d2475Dc",
"weight": "null",
"symbol": "BRZ"
},
{
"address": "0xf2f77FE7b8e66571E0fca7104c4d670BF1C8d722",
"weight": "null",
"symbol": "jBRL"
}
]
},
"tokenLogoURIs": {
"0x4eD141110F6EeeAbA9A1df36d8c26f684d2475Dc": "https://assets.coingecko.com/coins/images/8472/large/MicrosoftTeams-image_%286%29.png?1674480131",
"0xf2f77FE7b8e66571E0fca7104c4d670BF1C8d722": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xf2f77fe7b8e66571e0fca7104c4d670bf1c8d722.png"
}
},
{
"address": "0x54f220a891f468629027C3Cc8A58722D4F576402",
"network": 1101,
Expand Down Expand Up @@ -6452,9 +6539,9 @@
]
},
"tokenLogoURIs": {
"0x6CB787a419c3e6Ee2e9FF365856c29CD10659113": "",
"0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE": "",
"0xc46be4B8Bb6B5A3d3120660efae9C5416318ED40": ""
"0x6CB787a419c3e6Ee2e9FF365856c29CD10659113": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x6cb787a419c3e6ee2e9ff365856c29cd10659113.png",
"0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xbd724eb087d4cc0f61a5fed1fffaf937937e14de.png",
"0xc46be4B8Bb6B5A3d3120660efae9C5416318ED40": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xc46be4b8bb6b5a3d3120660efae9c5416318ed40.png"
}
},
{
Expand Down Expand Up @@ -6515,6 +6602,35 @@
"0xc6EeE8cb7643eC2F05F46d569e9eC8EF8b41b389": ""
}
},
{
"address": "0x671eD21480acf63b0AB7297b901505F5BccAfa9b",
"network": 42161,
"isKilled": false,
"relativeWeightCap": "1",
"addedTimestamp": 1691605463,
"pool": {
"id": "0x3fd4954a851ead144c2ff72b1f5a38ea5976bd54000000000000000000000480",
"address": "0x3FD4954a851eaD144c2FF72B1f5a38Ea5976Bd54",
"poolType": "ComposableStable",
"symbol": "ankrETH/wstETH-BPT",
"tokens": [
{
"address": "0x5979D7b546E38E414F7E9822514be443A4800529",
"weight": "null",
"symbol": "wstETH"
},
{
"address": "0xe05A08226c49b636ACf99c40Da8DC6aF83CE5bB3",
"weight": "null",
"symbol": "ankrETH"
}
]
},
"tokenLogoURIs": {
"0x5979D7b546E38E414F7E9822514be443A4800529": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x5979d7b546e38e414f7e9822514be443a4800529.png",
"0xe05A08226c49b636ACf99c40Da8DC6aF83CE5bB3": "https://assets.coingecko.com/coins/images/13403/large/aETHc.png?1625756490"
}
},
{
"address": "0x175FAb9C7aB502B9E76E7fca0C9Da618387EBAdA",
"network": 42161,
Expand Down Expand Up @@ -6633,8 +6749,8 @@
]
},
"tokenLogoURIs": {
"0x40af308e3d07ec769D85EB80aFb116525fF4aC99": "",
"0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE": ""
"0x40af308e3d07ec769D85EB80aFb116525fF4aC99": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0x40af308e3d07ec769d85eb80afb116525ff4ac99.png",
"0xbD724Eb087d4cc0f61a5fED1fFFaF937937E14DE": "https://raw.githubusercontent.com/balancer/tokenlists/main/src/assets/images/tokens/0xbd724eb087d4cc0f61a5fed1fffaf937937e14de.png"
}
},
{
Expand Down Expand Up @@ -6665,5 +6781,34 @@
"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": "0xF07b17DC2f1bCA19dDe307690b59bAE3322fAf0F",
"network": 42161,
"isKilled": false,
"relativeWeightCap": "1",
"addedTimestamp": 1691432951,
"pool": {
"id": "0xa1ea76c42b2938cfa9abea12357881006c52851300000000000000000000048f",
"address": "0xA1ea76C42b2938CfA9abea12357881006c528513",
"poolType": "ComposableStable",
"symbol": "DUSD/bbaUSD",
"tokens": [
{
"address": "0x8EC1877698ACF262Fe8Ad8a295ad94D6ea258988",
"weight": "null",
"symbol": "DUSD"
},
{
"address": "0xc6EeE8cb7643eC2F05F46d569e9eC8EF8b41b389",
"weight": "null",
"symbol": "bb-a-USD"
}
]
},
"tokenLogoURIs": {
"0x8EC1877698ACF262Fe8Ad8a295ad94D6ea258988": "https://assets.coingecko.com/coins/images/28775/large/dusd_logo_200x200.png?1685432656",
"0xc6EeE8cb7643eC2F05F46d569e9eC8EF8b41b389": ""
}
}
]
18 changes: 18 additions & 0 deletions src/lib/config/arbitrum/pools.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ const pools: Pools = {
'0x4a2f6ae7f3e5d715689530873ec35593dc28951b000000000000000000000481',
'0x9cebf13bb702f253abf1579294694a1edad00eaa000000000000000000000486',
'0x84a1038d55e887c2abb8cb02ccf4c9d3871c859a000000000000000000000489',
'0xa1ea76c42b2938cfa9abea12357881006c52851300000000000000000000048f',
],
AllowList: [],
},
Expand Down Expand Up @@ -270,6 +271,22 @@ const pools: Pools = {
},
},
},
'0x9cebf13bb702f253abf1579294694a1edad00eaa000000000000000000000486': {
features: {
[PoolFeature.Boosted]: {
featureProtocols: [Protocol.Aave],
},
},
},
'0xa1ea76c42b2938cfa9abea12357881006c52851300000000000000000000048f': {
name: 'DUSD/Boosted Aave v3 USD',
hasIcon: false,
features: {
[PoolFeature.Boosted]: {
featureProtocols: [Protocol.Aave],
},
},
},
},
Deep: [
'0x077794c30afeccdf5ad2abc0588e8cee7197b71a000000000000000000000352', // bb-rf-usd (arbitrum)
Expand All @@ -289,6 +306,7 @@ const pools: Pools = {
'0x9cebf13bb702f253abf1579294694a1edad00eaa000000000000000000000486', // bb-a-usdc/bb-a-usdc.e
'0xbbf9d705b75f408cfcaee91da32966124d2c6f7d00000000000000000000047e', // DOLA/bbaUSD
'0x00fcd3d55085e998e291a0005cedecf58ac14c4000020000000000000000047f', // 50STG-50bbaUSD
'0xa1ea76c42b2938cfa9abea12357881006c52851300000000000000000000048f', // DUSD/bbausd
],
Deprecated: {
'0xcba9ff45cfb9ce238afde32b0148eb82cbe635620000000000000000000003fd': {
Expand Down
9 changes: 8 additions & 1 deletion src/lib/config/base/pools.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const pools: Pools = {
PerPool: 10,
PerPoolInitial: 5,
},
BoostsEnabled: true,
BoostsEnabled: false,
DelegateOwner: '0xba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1b',
ZeroAddress: '0x0000000000000000000000000000000000000000',
DynamicFees: {
Expand Down Expand Up @@ -43,6 +43,9 @@ const pools: Pools = {
'0x0be4dc963db6ca066ff147069b9c437da683608b00020000000000000000000f', // OGRE/WETH
'0xa892be6ee527f4fb8b3b60486a53c0627cb1d27e000200000000000000000014', // LINU/WETH
'0x012e776cc3ed4c5adea3eda8677e82343e4de396000200000000000000000015', // 50WETH/50USDbC
'0x52e281318fed4efffb8e46c0847a8f9b71a461a8000200000000000000000018', // 50BTC-50WETH
'0x036d68e4e0005da4ef1c9ebd53b948d2c083495e00020000000000000000001a', // 50BTC-50USD
'0xe40cbccba664c7b1a953827c062f5070b78de86800020000000000000000001b', // WETH-GOLD
],
},
Factories: {
Expand All @@ -55,6 +58,10 @@ const pools: Pools = {
'0x868f0efc81a6c1df16298dcc82f7926b9099946b00020000000000000000000b', // Bald/weth
'0x2db50a0e0310723ef0c2a165cb9a9f80d772ba2f00020000000000000000000d', // WETH/stabal3
'0x6fbfcf88db1aada31f34215b2a1df7fafb4883e900000000000000000000000c', // stabal3
'0xe58ca65f418d4121d6c70d4c133e60cf6fda363c000000000000000000000013', // usdc/axlusd
'0x52e281318fed4efffb8e46c0847a8f9b71a461a8000200000000000000000018', // 50BTC-50WETH
'0x036d68e4e0005da4ef1c9ebd53b948d2c083495e00020000000000000000001a', // 50BTC-50USD
'0xe40cbccba664c7b1a953827c062f5070b78de86800020000000000000000001b', // WETH-GOLD
],
},
Metadata: {
Expand Down
Loading

1 comment on commit a28cd56

@vercel
Copy link

@vercel vercel bot commented on a28cd56 Aug 10, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

beta-app-v2 – ./

beta-app-v2-git-develop-balancer.vercel.app
beta-app-v2-balancer.vercel.app
beta-app-v2.vercel.app
beta.balancer.fi

Please sign in to comment.