From a0d5b4257aae657ee844fd55b5e97726b3ff9e25 Mon Sep 17 00:00:00 2001 From: gmbronco <83549293+gmbronco@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:52:49 +0200 Subject: [PATCH 1/5] use subgraph deployment if for zkevm (#963) --- .changeset/quick-bulldogs-love.md | 5 +++++ config/zkevm.ts | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/quick-bulldogs-love.md diff --git a/.changeset/quick-bulldogs-love.md b/.changeset/quick-bulldogs-love.md new file mode 100644 index 000000000..f9b5fe226 --- /dev/null +++ b/.changeset/quick-bulldogs-love.md @@ -0,0 +1,5 @@ +--- +'backend': patch +--- + +use subgraph deployment if for zkevm diff --git a/config/zkevm.ts b/config/zkevm.ts index 802e2a6a7..ea948a5fd 100644 --- a/config/zkevm.ts +++ b/config/zkevm.ts @@ -12,7 +12,9 @@ export default { }, subgraphs: { startDate: '2023-05-17', - balancer: [`https://api.studio.thegraph.com/query/24660/balancer-polygon-zk-v2/version/latest`], + balancer: [ + `https://gateway-arbitrum.network.thegraph.com/api/${env.THEGRAPH_API_KEY_BALANCER}/deployments/id/QmVNcphdNjTCaJ4ammPtFzRyD4gmyNBomKcVFZ98RADpS1`, + ], beetsBar: 'https://', blocks: 'https://api.studio.thegraph.com/query/48427/bleu-polygon-zkevm-blocks/version/latest', gauge: `https://api.studio.thegraph.com/query/24660/balancer-gauges-polygon-zk/version/latest`, From 1c9aa5b54f4141ebe0867ada2c0ed60dc332ac9e Mon Sep 17 00:00:00 2001 From: gmbronco <83549293+gmbronco@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:04:52 +0200 Subject: [PATCH 2/5] use default rpc url for fetching svEth APR data (#964) --- .changeset/pink-onions-hammer.md | 5 +++++ .../lib/apr-data-sources/yb-apr-handlers/sources/sv-eth.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/pink-onions-hammer.md diff --git a/.changeset/pink-onions-hammer.md b/.changeset/pink-onions-hammer.md new file mode 100644 index 000000000..ea3419887 --- /dev/null +++ b/.changeset/pink-onions-hammer.md @@ -0,0 +1,5 @@ +--- +'backend': patch +--- + +use default rpc url for fetching svEth APR data diff --git a/modules/pool/lib/apr-data-sources/yb-apr-handlers/sources/sv-eth.ts b/modules/pool/lib/apr-data-sources/yb-apr-handlers/sources/sv-eth.ts index 62ef79bd5..8b20ca4f3 100644 --- a/modules/pool/lib/apr-data-sources/yb-apr-handlers/sources/sv-eth.ts +++ b/modules/pool/lib/apr-data-sources/yb-apr-handlers/sources/sv-eth.ts @@ -1,10 +1,11 @@ import { createPublicClient, formatEther, http, parseAbi } from 'viem'; import { mainnet } from 'viem/chains'; import type { AprHandler } from '../'; +import config from '../../../../../../config/mainnet'; const client = createPublicClient({ chain: mainnet, - transport: http('https://rpc.eth.gateway.fm'), + transport: http(config.rpcUrl), }); const distributor = '0xc93ab6aca2c14422a65a31010ac2b4baa86a21b3' as `0x${string}`; From dd3e100ad3eac742f849e133b2edebf51017c874 Mon Sep 17 00:00:00 2001 From: John Grant Date: Tue, 24 Sep 2024 10:41:57 +0100 Subject: [PATCH 3/5] fix: Enable sdBal stable pool in SOR. (#966) --- .changeset/strange-cheetahs-beam.md | 5 +++++ modules/sor/sorV2/lib/static.ts | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .changeset/strange-cheetahs-beam.md diff --git a/.changeset/strange-cheetahs-beam.md b/.changeset/strange-cheetahs-beam.md new file mode 100644 index 000000000..7d3c18812 --- /dev/null +++ b/.changeset/strange-cheetahs-beam.md @@ -0,0 +1,5 @@ +--- +'backend': patch +--- + +Enable sdBal stable pool. diff --git a/modules/sor/sorV2/lib/static.ts b/modules/sor/sorV2/lib/static.ts index 8c4e56c99..6bfdafd81 100644 --- a/modules/sor/sorV2/lib/static.ts +++ b/modules/sor/sorV2/lib/static.ts @@ -39,7 +39,12 @@ export async function sorGetPathsWithPools( case 'STABLE': // Since we allowed all the pools, we started getting BAL#322 errors // Enabling pools one by one until we find the issue - if (prismaPool.id === '0x3dd0843a028c86e0b760b1a76929d1c5ef93a2dd000200000000000000000249') { + if ( + [ + '0x3dd0843a028c86e0b760b1a76929d1c5ef93a2dd000200000000000000000249', // auraBal/8020 + '0x2d011adf89f0576c9b722c28269fcb5d50c2d17900020000000000000000024d', // sdBal/8020 + ].includes(prismaPool.id) + ) { basePools.push(StablePool.fromPrismaPool(prismaPool)); } break; From 0cb92140b353cdd1094b485411273decbb16c155 Mon Sep 17 00:00:00 2001 From: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Date: Tue, 24 Sep 2024 06:39:05 -0400 Subject: [PATCH 4/5] Stata lusd and crv usd (#965) * stataLUSD-and-crvUSD Adding apr handling for mainnet stataLUSD and statacrvUSD per new rate provider reviews. https://github.com/balancer/code-review/issues/155 https://github.com/balancer/code-review/issues/154 * Update mainnet.ts * changeset --------- Co-authored-by: franz --- .changeset/friendly-chefs-hammer.md | 5 +++++ config/mainnet.ts | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .changeset/friendly-chefs-hammer.md diff --git a/.changeset/friendly-chefs-hammer.md b/.changeset/friendly-chefs-hammer.md new file mode 100644 index 000000000..b7d5d417c --- /dev/null +++ b/.changeset/friendly-chefs-hammer.md @@ -0,0 +1,5 @@ +--- +'backend': patch +--- + +adding Aave lUSD and crvUSD APRs diff --git a/config/mainnet.ts b/config/mainnet.ts index 793c1738f..bc9e378e0 100644 --- a/config/mainnet.ts +++ b/config/mainnet.ts @@ -8,6 +8,8 @@ const underlyingTokens = { USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7', DAI: '0x6b175474e89094c44da98b954eedeac495271d0f', wETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + crvUSD: '0xf939e0a03fb07f59a73314e73794be0e57ac1b4e', + LUSD: '0x5f98805a4e8be255a32880fdec7f6728c6568ba0', }; export default { @@ -173,6 +175,20 @@ export default { stataEthWETH: '0x03928473f25bb2da6bc880b07ecbadc636822264', }, }, + crvUSD: { + underlyingAssetAddress: underlyingTokens.crvUSD, + aTokenAddress: '0xb82fa9f31612989525992fcfbb09ab22eff5c85a', + wrappedTokens: { + stataEthcrvUSD: '0x848107491e029afde0ac543779c7790382f15929', + }, + }, + LUSD: { + underlyingAssetAddress: underlyingTokens.LUSD, + aTokenAddress: '0x3fe6a295459fae07df8a0cecc36f37160fe86aa9', + wrappedTokens: { + stataEthLUSD: '0xdbf5e36569798d1e39ee9d7b1c61a7409a74f23a', + }, + }, }, }, }, From 3db747807c5a0493c2d93a6516a90b97761e83dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:27:27 +0200 Subject: [PATCH 5/5] Version Packages (#968) Co-authored-by: github-actions[bot] --- .changeset/friendly-chefs-hammer.md | 5 ----- .changeset/pink-onions-hammer.md | 5 ----- .changeset/quick-bulldogs-love.md | 5 ----- .changeset/strange-cheetahs-beam.md | 5 ----- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 6 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 .changeset/friendly-chefs-hammer.md delete mode 100644 .changeset/pink-onions-hammer.md delete mode 100644 .changeset/quick-bulldogs-love.md delete mode 100644 .changeset/strange-cheetahs-beam.md diff --git a/.changeset/friendly-chefs-hammer.md b/.changeset/friendly-chefs-hammer.md deleted file mode 100644 index b7d5d417c..000000000 --- a/.changeset/friendly-chefs-hammer.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'backend': patch ---- - -adding Aave lUSD and crvUSD APRs diff --git a/.changeset/pink-onions-hammer.md b/.changeset/pink-onions-hammer.md deleted file mode 100644 index ea3419887..000000000 --- a/.changeset/pink-onions-hammer.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'backend': patch ---- - -use default rpc url for fetching svEth APR data diff --git a/.changeset/quick-bulldogs-love.md b/.changeset/quick-bulldogs-love.md deleted file mode 100644 index f9b5fe226..000000000 --- a/.changeset/quick-bulldogs-love.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'backend': patch ---- - -use subgraph deployment if for zkevm diff --git a/.changeset/strange-cheetahs-beam.md b/.changeset/strange-cheetahs-beam.md deleted file mode 100644 index 7d3c18812..000000000 --- a/.changeset/strange-cheetahs-beam.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'backend': patch ---- - -Enable sdBal stable pool. diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e114b9fe..f5308f4b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # backend +## 1.20.6 + +### Patch Changes + +- 0cb9214: adding Aave lUSD and crvUSD APRs +- 1c9aa5b: use default rpc url for fetching svEth APR data +- a0d5b42: use subgraph deployment if for zkevm +- dd3e100: Enable sdBal stable pool. + ## 1.20.5 ### Patch Changes diff --git a/package.json b/package.json index 4739e5ec5..da6c46911 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "backend", - "version": "1.20.5", + "version": "1.20.6", "description": "Backend service for Beethoven X and Balancer", "repository": "https://github.com/balancer/backend", "author": "Beethoven X",