Merge branch 'main' into observe-more-things

stellar · Nov 17, 2023 · 07e4c5a · 07e4c5a
2 parents 7cf74ff + 014004b
commit 07e4c5a
Show file tree

Hide file tree

Showing 34 changed files with 37 additions and 39 deletions.
diff --git a/soroban-bench-utils/Cargo.toml b/soroban-bench-utils/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 version.workspace = true
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 publish = false
 
 [dependencies]

diff --git a/soroban-builtin-sdk-macros/Cargo.toml b/soroban-builtin-sdk-macros/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 version.workspace = true
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 proc-macro = true

diff --git a/soroban-env-common/Cargo.toml b/soroban-env-common/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 version.workspace = true
 readme = "../README.md"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [build_dependencies]
 crate-git-revision = "0.0.6"

diff --git a/soroban-env-common/tests/no_std/Cargo.toml b/soroban-env-common/tests/no_std/Cargo.toml
@@ -3,7 +3,7 @@ name = "test_no_std"
 version.workspace = true
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 doctest = false

diff --git a/soroban-env-guest/Cargo.toml b/soroban-env-guest/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 version.workspace = true
 readme = "../README.md"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [dependencies]
 soroban-env-common = { workspace = true, features = [] }

diff --git a/soroban-env-host/Cargo.toml b/soroban-env-host/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 version.workspace = true
 readme = "../README.md"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 build = "build.rs"
 
 [dependencies]

diff --git a/soroban-env-host/src/budget/limits.rs b/soroban-env-host/src/budget/limits.rs
@@ -10,11 +10,11 @@ use crate::{
 /// exccessive stack allocation, which could cause an unrecoverable `SIGABRT`,
 /// and exccessive heap memory allocation.
 pub const DEFAULT_XDR_RW_LIMITS: Limits = Limits {
-    /// recursion limit for reading and writing XDR structures.
+    // recursion limit for reading and writing XDR structures.
     depth: 500,
-    /// maximum byte length for a data structure during serialization and
-    /// deserialization to and from the XDR format. The limit of 16MiB
-    /// corresponds to the overlay maximum message size.
+    // maximum byte length for a data structure during serialization and
+    // deserialization to and from the XDR format. The limit of 16MiB
+    // corresponds to the overlay maximum message size.
     len: 0x1000000,
 };
 

diff --git a/soroban-env-host/src/e2e_invoke.rs b/soroban-env-host/src/e2e_invoke.rs
@@ -93,10 +93,9 @@ pub fn get_ledger_changes<T: SnapshotSource>(
     init_storage_snapshot: &T,
     init_ttl_entries: TtlEntryMap,
 ) -> Result<Vec<LedgerEntryChange>, HostError> {
-    let mut changes = vec![];
     // Skip allocation metering for this for the sake of simplicity - the
     // bounding factor here is XDR decoding which is metered.
-    changes.reserve(storage.map.len());
+    let mut changes = Vec::with_capacity(storage.map.len());
 
     let footprint_map = &storage.footprint.0;
     // We return any invariant errors here as internal errors, as they would

diff --git a/soroban-env-host/src/events/internal.rs b/soroban-env-host/src/events/internal.rs
@@ -179,14 +179,13 @@ impl InternalEventsBuffer {
     /// Converts the internal events into their external representation. This should only be called
     /// either when the host is finished (via `try_finish`), or when an error occurs.
     pub fn externalize(&self, host: &Host) -> Result<Events, HostError> {
-        let mut vec: Vec<HostEvent> = vec![];
         // This line is intentionally unmetered. We want to separate out charging
         // the main budget for `Contract` events (with "observable" costs) from
         // charging the debug budget for `Diagnostic` events (with "non-observable"
         // costs). Both event types are stored in the same input vector so we must
         // not do a bulk charge based on its length, but rather walk through it
         // charging to one budget or the other on an event-by-event basis.
-        vec.reserve(self.vec.len());
+        let mut vec = Vec::with_capacity(self.vec.len());
 
         let mut metered_external_event_push =
             |event: xdr::ContractEvent, status: &EventError| -> Result<(), HostError> {

diff --git a/soroban-env-host/src/test/util.rs b/soroban-env-host/src/test/util.rs
@@ -82,7 +82,7 @@ impl SnapshotSource for MockSnapshotSource {
 }
 
 impl Host {
-    pub(crate) const TEST_PRNG_SEED: &[u8; 32] = b"12345678901234567890123456789012";
+    pub(crate) const TEST_PRNG_SEED: &'static [u8; 32] = b"12345678901234567890123456789012";
 
     pub(crate) fn test_host() -> Self {
         let host = Host::default();

diff --git a/soroban-env-macros/Cargo.toml b/soroban-env-macros/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 version.workspace = true
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 proc-macro = true

diff --git a/soroban-synth-wasm/Cargo.toml b/soroban-synth-wasm/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 version.workspace = true
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 publish = false
 
 [dependencies]

diff --git a/soroban-test-wasms/Cargo.toml b/soroban-test-wasms/Cargo.toml
@@ -4,4 +4,4 @@ version.workspace = true
 description = "crate full of precompiled test WASM binaries for soroban -- for use in other tests, do not publish"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
diff --git a/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml b/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/auth/Cargo.toml b/soroban-test-wasms/wasm-workspace/auth/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/complex/Cargo.toml b/soroban-test-wasms/wasm-workspace/complex/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml b/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/err/Cargo.toml b/soroban-test-wasms/wasm-workspace/err/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml b/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/fib/Cargo.toml b/soroban-test-wasms/wasm-workspace/fib/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml b/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/update/Cargo.toml b/soroban-test-wasms/wasm-workspace/update/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/vec/Cargo.toml b/soroban-test-wasms/wasm-workspace/vec/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml b/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version = "1.73"
+rust-version = "1.74"
 
 [lib]
 crate-type = ["cdylib", "rlib"]