From db059fa1302146e2ae34d6a270a969047bb6788c Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 11 Sep 2023 13:10:00 -0600 Subject: [PATCH 1/7] Sommelier: Add Turbo GHO --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index c66f279f45..565731ed3a 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -13,6 +13,7 @@ const realYieldENS = '0x18ea937aba6053bc232d9ae2c42abe7a8a2be440'; const fraximal = '0xdbe19d1c3f21b1bb250ca7bdae0687a97b5f77e6'; const realYieldBtc = '0x0274a704a6d9129f90a62ddc6f6024b33ecdad36'; const turbosweth = '0xd33dad974b938744dac81fe00ac67cb5aa13958e'; +const turbogho = '0x0c190ded9be5f512bd72827bdad4003e9cc7975c'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -39,6 +40,7 @@ const stakingPools = { [defiStars]: '0x0349b3c56adb9e39b5d75fc1df52eee313dd80d1', [fraximal]: '0x290a42e913083edf5aefb241f8a12b306c19f8f9', [turbosweth]: '0x69374d81fdc42add0fe1dc655705e40b51b6681b', + [turbogho]: '0x6e5bb558d6c33ca45dc9efe0746a3c80bc3e70e1', }; // List of v0815 Cellars @@ -277,6 +279,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/Turbo-SWETH', }, + { + pool: `${turbogho}-ethereum`, + chain, + project, + symbol: 'GHO-USDC-USDT-DAI-LUSD', + poolMeta: 'TurboGHO', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/Turbo-GHO', + }, ]; module.exports = { From a0ddb9f59c524dee66a997c7f857597e55d73a69 Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 14 Sep 2023 09:42:14 -0600 Subject: [PATCH 2/7] Edge case for apys --- src/adaptors/sommelier/apy.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/adaptors/sommelier/apy.js b/src/adaptors/sommelier/apy.js index 4561056b58..2832a2233b 100644 --- a/src/adaptors/sommelier/apy.js +++ b/src/adaptors/sommelier/apy.js @@ -61,7 +61,25 @@ async function calcApy( const startBlock = await getBlockByEpoch(startEpochSecs); const endBlock = await getBlockByEpoch(endEpochSecs); - const startValue = await getShareValueAtBlock(cellarAddress, startBlock); + // APY 7 day may error out if share price oracle was not live for 7 days, so try catch here + // Note we dont do this in the daily APY because that should always work if we're live + // End Value should always work so only do this for start value + + let startValue; + try { + startValue = await getShareValueAtBlock(cellarAddress, startBlock); + } catch (e) { + console.error( + 'Unable to get start value for calcApy cellar: ', + cellarAddress, + 'startBlock: ', + startBlock, + 'intervalDays: ', + intervalDays, + ); + return 0; // Return 0 for APY if we can't get start value + } + const endValue = await getShareValueAtBlock(cellarAddress, endBlock); const yieldRatio = endValue.minus(startValue).div(startValue); From eab464264364b0f6c019d70b157f1a0f924fcd19 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 18 Sep 2023 16:29:56 -0600 Subject: [PATCH 3/7] Sommelier: Add ETH Trend Growth vault --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index 565731ed3a..6025b41f93 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -14,6 +14,7 @@ const fraximal = '0xdbe19d1c3f21b1bb250ca7bdae0687a97b5f77e6'; const realYieldBtc = '0x0274a704a6d9129f90a62ddc6f6024b33ecdad36'; const turbosweth = '0xd33dad974b938744dac81fe00ac67cb5aa13958e'; const turbogho = '0x0c190ded9be5f512bd72827bdad4003e9cc7975c'; +const ethgrowth = '0x6c51041a91c91c86f3f08a72cb4d3f67f1208897'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -41,6 +42,7 @@ const stakingPools = { [fraximal]: '0x290a42e913083edf5aefb241f8a12b306c19f8f9', [turbosweth]: '0x69374d81fdc42add0fe1dc655705e40b51b6681b', [turbogho]: '0x6e5bb558d6c33ca45dc9efe0746a3c80bc3e70e1', + [ethgrowth]: '0xb1D3948F4DCd7Aa5e89449080F3D88870aD0137A', }; // List of v0815 Cellars @@ -292,6 +294,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/Turbo-GHO', }, + { + pool: `${ethgrowth}-ethereum`, + chain, + project, + symbol: 'USDC-YieldUSD-YieldETH', + poolMeta: 'ETH Trend Growth', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/ETH-Trend-Growth', + }, ]; module.exports = { From 0c63ca52d0b36187ed2eff17dbf3d22bd60d5aef Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 12 Oct 2023 14:26:19 -0600 Subject: [PATCH 4/7] Add Turbo Steth --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index 6025b41f93..b236afde35 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -15,6 +15,7 @@ const realYieldBtc = '0x0274a704a6d9129f90a62ddc6f6024b33ecdad36'; const turbosweth = '0xd33dad974b938744dac81fe00ac67cb5aa13958e'; const turbogho = '0x0c190ded9be5f512bd72827bdad4003e9cc7975c'; const ethgrowth = '0x6c51041a91c91c86f3f08a72cb4d3f67f1208897'; +const turbosteth = '0xfd6db5011b171b05e1ea3b92f9eacaeeb055e971'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -43,6 +44,7 @@ const stakingPools = { [turbosweth]: '0x69374d81fdc42add0fe1dc655705e40b51b6681b', [turbogho]: '0x6e5bb558d6c33ca45dc9efe0746a3c80bc3e70e1', [ethgrowth]: '0xb1D3948F4DCd7Aa5e89449080F3D88870aD0137A', + // TODO: If we add staking pool for turbo steth, add it here }; // List of v0815 Cellars @@ -294,6 +296,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/Turbo-GHO', }, + { + pool: `${turbosteth}-ethereum`, + chain, + project, + symbol: 'WETH-STETH-WSTETH', + poolMeta: 'TurboSTETH', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/Turbo-STETH', + }, { pool: `${ethgrowth}-ethereum`, chain, From da4774efcee5360a5a528c15504d8b28257a9bd3 Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 8 Nov 2023 14:06:07 -0700 Subject: [PATCH 5/7] Add Turbo SOMM --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index b236afde35..8290c60fab 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -16,6 +16,7 @@ const turbosweth = '0xd33dad974b938744dac81fe00ac67cb5aa13958e'; const turbogho = '0x0c190ded9be5f512bd72827bdad4003e9cc7975c'; const ethgrowth = '0x6c51041a91c91c86f3f08a72cb4d3f67f1208897'; const turbosteth = '0xfd6db5011b171b05e1ea3b92f9eacaeeb055e971'; +const turbosomm = '0x5195222f69c5821f8095ec565e71e18ab6a2298f'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -45,6 +46,7 @@ const stakingPools = { [turbogho]: '0x6e5bb558d6c33ca45dc9efe0746a3c80bc3e70e1', [ethgrowth]: '0xb1D3948F4DCd7Aa5e89449080F3D88870aD0137A', // TODO: If we add staking pool for turbo steth, add it here + // TODO: If we add staking pool for turbo somm, add it here }; // List of v0815 Cellars @@ -322,6 +324,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/ETH-Trend-Growth', }, + { + pool: `${turbosomm}-ethereum`, + chain, + project, + symbol: 'SOMM-WETH', + poolMeta: 'TurboSOMM', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/Turbo-SOMM', + }, ]; module.exports = { From 4463ac24c7062bd15a7d2302e52d921fb658475a Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 22 Nov 2023 14:02:30 -0700 Subject: [PATCH 6/7] Sommelier: Add Turbo EETH Vault --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index 8290c60fab..0b515bc819 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -17,6 +17,7 @@ const turbogho = '0x0c190ded9be5f512bd72827bdad4003e9cc7975c'; const ethgrowth = '0x6c51041a91c91c86f3f08a72cb4d3f67f1208897'; const turbosteth = '0xfd6db5011b171b05e1ea3b92f9eacaeeb055e971'; const turbosomm = '0x5195222f69c5821f8095ec565e71e18ab6a2298f'; +const turboeeth = '0x9a7b4980C6F0FCaa50CD5f288Ad7038f434c692e'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -47,6 +48,7 @@ const stakingPools = { [ethgrowth]: '0xb1D3948F4DCd7Aa5e89449080F3D88870aD0137A', // TODO: If we add staking pool for turbo steth, add it here // TODO: If we add staking pool for turbo somm, add it here + [turboeeth]: '0x596c3f05ba9c6c356527e47989b3ed26e2b3449d', }; // List of v0815 Cellars @@ -337,6 +339,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/Turbo-SOMM', }, + { + pool: `${turboeeth}-ethereum`, + chain, + project, + symbol: 'WETH-EETH', + poolMeta: 'TurboEETH', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/Turbo-eETH', + }, ]; module.exports = { From b759fd524f957251bc8408d4dcfbc53145e0f072 Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 6 Dec 2023 13:35:39 -0700 Subject: [PATCH 7/7] Sommelier: Add turbo steth 2 vault --- src/adaptors/sommelier/config.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/adaptors/sommelier/config.js b/src/adaptors/sommelier/config.js index 0b515bc819..ea76b90f21 100644 --- a/src/adaptors/sommelier/config.js +++ b/src/adaptors/sommelier/config.js @@ -18,6 +18,7 @@ const ethgrowth = '0x6c51041a91c91c86f3f08a72cb4d3f67f1208897'; const turbosteth = '0xfd6db5011b171b05e1ea3b92f9eacaeeb055e971'; const turbosomm = '0x5195222f69c5821f8095ec565e71e18ab6a2298f'; const turboeeth = '0x9a7b4980C6F0FCaa50CD5f288Ad7038f434c692e'; +const turbostethstethDeposit = '0xc7372Ab5dd315606dB799246E8aA112405abAeFf'; // Rewards are paid out in EVM SOMM const rewardTokens = ['0xa670d7237398238de01267472c6f13e5b8010fd1']; @@ -49,6 +50,7 @@ const stakingPools = { // TODO: If we add staking pool for turbo steth, add it here // TODO: If we add staking pool for turbo somm, add it here [turboeeth]: '0x596c3f05ba9c6c356527e47989b3ed26e2b3449d', + // TODO: If we add staking pool for turbo steth (steth deposit), add it here }; // List of v0815 Cellars @@ -352,6 +354,19 @@ const v2p5Pools = [ underlyingTokens: [], url: 'https://app.sommelier.finance/strategies/Turbo-eETH', }, + { + pool: `${turbostethstethDeposit}-ethereum`, + chain, + project, + symbol: 'STETH-WSTETH-WETH', + poolMeta: 'TurboSTETH(stETHDeposit)', + tvlUsd: 0, + apyBase: 0, + apyReward: 0, + rewardTokens, + underlyingTokens: [], + url: 'https://app.sommelier.finance/strategies/Turbo-STETH-(steth-deposit)', + }, ]; module.exports = {