From ce7a55eddf3c2235b46be3d1957681d7c7faec01 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 2 Aug 2023 17:04:36 -0700 Subject: [PATCH] Bump env to c5607a2e9e296b2636b46dc910387aa3446b3e29 --- Cargo.lock | 12 ++++++------ Cargo.toml | 8 ++++---- soroban-ledger-snapshot/src/lib.rs | 4 ++++ soroban-sdk/src/env.rs | 1 + 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7056c823..f9bfa1959 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1170,7 +1170,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "soroban-env-common" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c#63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c5607a2e9e296b2636b46dc910387aa3446b3e29#c5607a2e9e296b2636b46dc910387aa3446b3e29" dependencies = [ "arbitrary", "crate-git-revision", @@ -1188,7 +1188,7 @@ dependencies = [ [[package]] name = "soroban-env-guest" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c#63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c5607a2e9e296b2636b46dc910387aa3446b3e29#c5607a2e9e296b2636b46dc910387aa3446b3e29" dependencies = [ "soroban-env-common", "static_assertions", @@ -1197,7 +1197,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c#63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c5607a2e9e296b2636b46dc910387aa3446b3e29#c5607a2e9e296b2636b46dc910387aa3446b3e29" dependencies = [ "backtrace", "curve25519-dalek", @@ -1223,7 +1223,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c#63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c5607a2e9e296b2636b46dc910387aa3446b3e29#c5607a2e9e296b2636b46dc910387aa3446b3e29" dependencies = [ "itertools", "proc-macro2", @@ -1250,7 +1250,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c#63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +source = "git+https://github.com/stellar/rs-soroban-env?rev=c5607a2e9e296b2636b46dc910387aa3446b3e29#c5607a2e9e296b2636b46dc910387aa3446b3e29" dependencies = [ "itertools", "proc-macro2", @@ -1376,7 +1376,7 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.17" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b#4eaf2388c1de6fc295ed5f7df8174c199923df5b" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=d6e02584ac9f4046bf38eaf445ced0d4f33631fd#d6e02584ac9f4046bf38eaf445ced0d4f33631fd" dependencies = [ "arbitrary", "base64 0.13.1", diff --git a/Cargo.toml b/Cargo.toml index d4961cc3a..2709385cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,17 +40,17 @@ soroban-token-sdk = { version = "0.9.2", path = "soroban-token-sdk" } [workspace.dependencies.soroban-env-common] version = "0.0.17" git = "https://github.com/stellar/rs-soroban-env" -rev = "63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +rev = "c5607a2e9e296b2636b46dc910387aa3446b3e29" [workspace.dependencies.soroban-env-guest] version = "0.0.17" git = "https://github.com/stellar/rs-soroban-env" -rev = "63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +rev = "c5607a2e9e296b2636b46dc910387aa3446b3e29" [workspace.dependencies.soroban-env-host] version = "0.0.17" git = "https://github.com/stellar/rs-soroban-env" -rev = "63cf7fe3d5ffc60db57fba97e9fc9c5778cd559c" +rev = "c5607a2e9e296b2636b46dc910387aa3446b3e29" [workspace.dependencies.stellar-strkey] version = "0.0.7" @@ -60,7 +60,7 @@ rev = "e6ba45c60c16de28c7522586b80ed0150157df73" [workspace.dependencies.stellar-xdr] version = "0.0.17" git = "https://github.com/stellar/rs-stellar-xdr" -rev = "4eaf2388c1de6fc295ed5f7df8174c199923df5b" +rev = "d6e02584ac9f4046bf38eaf445ced0d4f33631fd" default-features = false #[patch."https://github.com/stellar/rs-soroban-env"] diff --git a/soroban-ledger-snapshot/src/lib.rs b/soroban-ledger-snapshot/src/lib.rs index 063039056..aad6f5623 100644 --- a/soroban-ledger-snapshot/src/lib.rs +++ b/soroban-ledger-snapshot/src/lib.rs @@ -33,6 +33,7 @@ pub struct LedgerSnapshot { pub min_temp_entry_expiration: u32, pub max_entry_expiration: u32, pub ledger_entries: Vec<(Box, Box)>, + pub autobump_ledgers: u32, } impl LedgerSnapshot { @@ -75,6 +76,7 @@ impl LedgerSnapshot { min_persistent_entry_expiration: self.min_persistent_entry_expiration, min_temp_entry_expiration: self.min_temp_entry_expiration, max_entry_expiration: self.max_entry_expiration, + autobump_ledgers: self.autobump_ledgers, } } @@ -85,6 +87,7 @@ impl LedgerSnapshot { self.timestamp = info.timestamp; self.network_id = info.network_id; self.base_reserve = info.base_reserve; + self.autobump_ledgers = info.autobump_ledgers; } /// Get the entries in the snapshot. @@ -166,6 +169,7 @@ impl Default for LedgerSnapshot { min_persistent_entry_expiration: Default::default(), min_temp_entry_expiration: Default::default(), max_entry_expiration: Default::default(), + autobump_ledgers: Default::default(), } } } diff --git a/soroban-sdk/src/env.rs b/soroban-sdk/src/env.rs index bcdf0bf60..53ac6560f 100644 --- a/soroban-sdk/src/env.rs +++ b/soroban-sdk/src/env.rs @@ -531,6 +531,7 @@ impl Env { min_persistent_entry_expiration: 4096, min_temp_entry_expiration: 16, max_entry_expiration: 6_312_000, + autobump_ledgers: 0, }); env