diff --git a/Cargo.lock b/Cargo.lock index 79a07593..4e9f63fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4688,7 +4688,7 @@ dependencies = [ [[package]] name = "sommelier_steward" -version = "3.4.3" +version = "3.5.0" dependencies = [ "lazy_static", "steward", @@ -4779,7 +4779,7 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "steward" -version = "3.4.3" +version = "3.5.0" dependencies = [ "abscissa_core", "abscissa_tokio", @@ -4832,7 +4832,7 @@ dependencies = [ [[package]] name = "steward_abi" -version = "3.4.3" +version = "3.5.0" dependencies = [ "ethers", "serde", @@ -4852,7 +4852,7 @@ dependencies = [ [[package]] name = "steward_proto" -version = "3.4.3" +version = "3.5.0" dependencies = [ "prost 0.7.0", "prost-types 0.7.0", diff --git a/Cargo.toml b/Cargo.toml index 667dfc4a..f096153d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sommelier_steward" -version = "3.4.3" +version = "3.5.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/steward/Cargo.toml b/steward/Cargo.toml index a89ca02c..5a05c280 100644 --- a/steward/Cargo.toml +++ b/steward/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "steward" authors = [] -version = "3.4.3" +version = "3.5.0" edition = "2018" [dependencies] diff --git a/steward/src/cellars.rs b/steward/src/cellars.rs index 63b63591..0580ecc5 100644 --- a/steward/src/cellars.rs +++ b/steward/src/cellars.rs @@ -29,16 +29,22 @@ pub const ORACLE2: (U256, &str) = ( U256([5, 0, 0, 0]), "c47278b65443ce71cf47e8455bb343f2db11b70e", ); +pub const ORACLE3: (U256, &str) = ( + U256([5, 0, 0, 0]), + "26cde3f5db92ea91c84c838e664fe42dec1b6747", +); pub const ALLOWED_PRICE_ORACLES: [(U256, &str); 2] = [ORACLE1, ORACLE2]; pub const ALLOWED_CACHE_PRICE_ROUTER: [&str; 1] = [CELLAR_RYETH]; // permissions pub const ALLOWED_V2_0_SETUP_ADAPTORS: [(&str, &str); 1] = [(CELLAR_RYUSD, ADAPTOR_CELLAR_V2)]; -pub const ALLOWED_V2_2_CATALOGUE_ADAPTORS: [(&str, &str); 3] = [ +pub const ALLOWED_V2_2_CATALOGUE_ADAPTORS: [(&str, &str); 5] = [ (CELLAR_RYETH, ADAPTOR_AAVE_V3_A_TOKEN_V1), (CELLAR_RYBTC, ADAPTOR_AAVE_V3_A_TOKEN_V1), - (CELLAR_RYBTC, ADAPTOR_CELLAR_V1), + (CELLAR_RYBTC, ADAPTOR_LEGACY_CELLAR_V1), + (CELLAR_RYBTC, ADAPTOR_COLLATERAL_F_TOKEN_V1), + (CELLAR_RYBTC, ADAPTOR_DEBT_F_TOKEN_V1), ]; pub const ALLOWED_V2_5_CATALOGUE_ADAPTORS: [(&str, &str); 0] = []; @@ -66,7 +72,7 @@ pub const ALLOWED_V2_0_POSITIONS: [(&str, u32); 20] = [ (CELLAR_RYUSD, 28), (CELLAR_RYUSD, 29), ]; -pub const ALLOWED_V2_2_CATALOGUE_POSITIONS: [(&str, u32); 7] = [ +pub const ALLOWED_V2_2_CATALOGUE_POSITIONS: [(&str, u32); 11] = [ (CELLAR_RYETH, 188), (CELLAR_RYETH, 189), (CELLAR_RYETH, 190), @@ -74,6 +80,10 @@ pub const ALLOWED_V2_2_CATALOGUE_POSITIONS: [(&str, u32); 7] = [ (CELLAR_RYBTC, 192), (CELLAR_RYBTC, 193), (CELLAR_RYBTC, 194), + (CELLAR_RYBTC, 195), + (CELLAR_RYBTC, 196), + (CELLAR_RYBTC, 197), + (CELLAR_RYBTC, 198), ]; pub const ALLOWED_V2_5_CATALOGUE_POSITIONS: [(&str, u32); 0] = []; @@ -130,8 +140,10 @@ pub const ADAPTOR_COMPOUND_C_TOKEN_V1: &str = "26dba82495f6189dde7648ae88bead46c // adaptors pub const ADAPTOR_AAVE_V3_A_TOKEN_V1: &str = "76cef5606c8b6ba38fe2e3c639e1659afa530b47"; -pub const ADAPTOR_CELLAR_V1: &str = "1e22adf9e63ef8f2a3626841ddddd19683e31068"; pub const ADAPTOR_CELLAR_V2: &str = "3b5ca5de4d808cd793d3a7b3a731d3e67e707b27"; +pub const ADAPTOR_COLLATERAL_F_TOKEN_V1: &str = "0055cf6a99eba1405d100c7dfaa88a35521a0037"; +pub const ADAPTOR_DEBT_F_TOKEN_V1: &str = "50d8f70a5da95021dab86579db4751a863c1b87c"; +pub const ADAPTOR_LEGACY_CELLAR_V1: &str = "1e22adf9e63ef8f2a3626841ddddd19683e31068"; 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 = diff --git a/steward_abi/Cargo.toml b/steward_abi/Cargo.toml index 48acfd3c..cf33ec1a 100644 --- a/steward_abi/Cargo.toml +++ b/steward_abi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "steward_abi" -version = "3.4.3" +version = "3.5.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/steward_proto_rust/Cargo.toml b/steward_proto_rust/Cargo.toml index 3f408968..4862e58c 100644 --- a/steward_proto_rust/Cargo.toml +++ b/steward_proto_rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "steward_proto" -version = "3.4.3" +version = "3.5.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html