From 36a437a23d64423322e0acf8367d07c19e57c5d3 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Fri, 15 Mar 2024 08:11:53 -0500 Subject: [PATCH 1/3] Turbo stETH and RY ETH permissions --- src/cellars.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/cellars.rs b/src/cellars.rs index 76100b2f..007db0fe 100644 --- a/src/cellars.rs +++ b/src/cellars.rs @@ -85,9 +85,16 @@ lazy_static! { // permissions pub const ALLOWED_V2_0_SETUP_ADAPTORS: [(&str, &str); 0] = []; -pub const ALLOWED_V2_2_CATALOGUE_ADAPTORS: [(&str, &str); 0] = []; -pub const ALLOWED_V2_5_CATALOGUE_ADAPTORS: [(&str, &str); 1] = - [(CELLAR_TURBO_EETH_DEPLOYMENT_1, ADAPTOR_ERC4626_V1)]; +pub const ALLOWED_V2_2_CATALOGUE_ADAPTORS: [(&str, &str); 1] = + [(CELLAR_RYETH, "0a64c091d428c7430fe1f47d53f7c8edb1285bce")]; +pub const ALLOWED_V2_5_CATALOGUE_ADAPTORS: [(&str, &str); 3] = [ + (CELLAR_TURBO_EETH_DEPLOYMENT_1, ADAPTOR_ERC4626_V1), + ( + CELLAR_TURBO_STETH, + "0a64c091d428c7430fe1f47d53f7c8edb1285bce", + ), + (CELLAR_TURBO_STETH, ADAPTOR_VESTING_SIMPLE_V1_1_DEPLOYMENT2), +]; // due to position size limits in v2.0, positions must be added and removed from the limited list // and thus approved positions need to be allowed to be re-added, hence this large list @@ -113,8 +120,9 @@ pub const ALLOWED_V2_0_POSITIONS: [(&str, u32); 20] = [ (CELLAR_RYUSD, 28), (CELLAR_RYUSD, 29), ]; -pub const ALLOWED_V2_2_CATALOGUE_POSITIONS: [(&str, u32); 0] = []; -pub const ALLOWED_V2_5_CATALOGUE_POSITIONS: [(&str, u32); 7] = [ +pub const ALLOWED_V2_2_CATALOGUE_POSITIONS: [(&str, u32); 2] = + [(CELLAR_RYETH, 200), (CELLAR_RYETH, 201)]; +pub const ALLOWED_V2_5_CATALOGUE_POSITIONS: [(&str, u32); 9] = [ (CELLAR_MORPHO_ETH_MAXIMIZER, 110000007), (CELLAR_MORPHO_ETH_MAXIMIZER, 110000008), (CELLAR_MORPHO_ETH_MAXIMIZER, 110000009), @@ -122,6 +130,8 @@ pub const ALLOWED_V2_5_CATALOGUE_POSITIONS: [(&str, u32); 7] = [ (CELLAR_MORPHO_ETH_MAXIMIZER, 11500004), (CELLAR_MORPHO_ETH_MAXIMIZER, 11500005), (CELLAR_TURBO_EETH_DEPLOYMENT_1, 10000004), + (CELLAR_TURBO_STETH, 69000002), + (CELLAR_TURBO_STETH, 100000008), ]; pub const BLOCKED_ADAPTORS: [&str; 3] = [ From 8dd29e622929ab6e276e1b06b91ab6c251f53ca2 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Fri, 15 Mar 2024 10:59:26 -0500 Subject: [PATCH 2/3] Lido staking adaptor const --- src/cellars.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cellars.rs b/src/cellars.rs index 007db0fe..439dc639 100644 --- a/src/cellars.rs +++ b/src/cellars.rs @@ -86,13 +86,10 @@ lazy_static! { pub const ALLOWED_V2_0_SETUP_ADAPTORS: [(&str, &str); 0] = []; pub const ALLOWED_V2_2_CATALOGUE_ADAPTORS: [(&str, &str); 1] = - [(CELLAR_RYETH, "0a64c091d428c7430fe1f47d53f7c8edb1285bce")]; + [(CELLAR_RYETH, ADAPTOR_LIDO_STAKING_V1)]; pub const ALLOWED_V2_5_CATALOGUE_ADAPTORS: [(&str, &str); 3] = [ (CELLAR_TURBO_EETH_DEPLOYMENT_1, ADAPTOR_ERC4626_V1), - ( - CELLAR_TURBO_STETH, - "0a64c091d428c7430fe1f47d53f7c8edb1285bce", - ), + (CELLAR_TURBO_STETH, ADAPTOR_LIDO_STAKING_V1), (CELLAR_TURBO_STETH, ADAPTOR_VESTING_SIMPLE_V1_1_DEPLOYMENT2), ]; @@ -202,6 +199,7 @@ pub const ADAPTOR_CURVE_ADAPTOR_V1: &str = "94e28529f73dad189cd0bf9d83a06572d4bf pub const ADAPTOR_DEBT_F_TOKEN_V1: &str = "50d8f70a5da95021dab86579db4751a863c1b87c"; pub const ADAPTOR_ERC4626_V1: &str = "411a4e55a4867610279ef35cba4da91a7753a93e"; pub const ADAPTOR_LEGACY_CELLAR_V1: &str = "1e22adf9e63ef8f2a3626841ddddd19683e31068"; +pub const ADAPTOR_LIDO_STAKING_V1: &str = "0a64c091d428c7430fe1f47d53f7c8edb1285bce"; pub const ADAPTOR_MORPHO_AAVE_V2_A_TOKEN_V1: &str = "1a4cb53edb8c65c3df6aa9d88c1ab4cf35312b73"; pub const ADAPTOR_MORPHO_AAVE_V2_DEBT_TOKEN_V1: &str = "407d5489f201013ee6a6ca20fccb05047c548138"; pub const ADAPTOR_MORPHO_AAVE_V3_A_TOKEN_COLLATERAL_V1: &str = From 770a45c170bdd53739fff83c98aa987f03d866f6 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Fri, 15 Mar 2024 11:00:47 -0500 Subject: [PATCH 3/3] Bump to v4.2.1 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a37f7c4..b79a58ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4045,7 +4045,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "steward" -version = "4.2.0" +version = "4.2.1" dependencies = [ "abscissa_core", "abscissa_tokio", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "steward-proto" -version = "4.2.0" +version = "4.2.1" dependencies = [ "prost", "serde", diff --git a/Cargo.toml b/Cargo.toml index b40fba6a..0b42f7a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "4.2.0" +version = "4.2.1" edition = "2021" [workspace.dependencies]