Merge release 2.2.2 into dev

Makefile

@@ -147,7 +147,7 @@ lint-smart-contracts:
 
 .PHONY: audit-rs
 audit-rs:
-	$(CARGO) audit --ignore RUSTSEC-2024-0437 --ignore RUSTSEC-2025-0022 --ignore RUSTSEC-2025-0055 --ignore RUSTSEC-2026-0001 --ignore RUSTSEC-2026-0007 --ignore RUSTSEC-2026-0049 --ignore RUSTSEC-2026-0068 --ignore RUSTSEC-2026-0067 --ignore RUSTSEC-2026-0098 --ignore RUSTSEC-2026-0099 --ignore RUSTSEC-2026-0104
+	$(CARGO) audit --ignore RUSTSEC-2024-0437 --ignore RUSTSEC-2025-0022 --ignore RUSTSEC-2025-0055 --ignore RUSTSEC-2026-0001 --ignore RUSTSEC-2026-0007 --ignore RUSTSEC-2026-0049 --ignore RUSTSEC-2026-0068 --ignore RUSTSEC-2026-0067 --ignore RUSTSEC-2026-0098 --ignore RUSTSEC-2026-0099 --ignore RUSTSEC-2026-0104 --ignore RUSTSEC-2026-0194 --ignore RUSTSEC-2026-0195
 
 .PHONY: audit
 audit: audit-rs

binary_port/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "casper-binary-port"
-version = "1.1.1"
+version = "1.2.1"
 edition = "2018"
 description = "Types for the casper node binary port"
 documentation = "https://docs.rs/casper-binary-port"
@@ -13,7 +13,7 @@ exclude = ["proptest-regressions"]
 [dependencies]
 bincode = "1.3.3"
 bytes = "1.0.1"
-casper-types = { version = "7.0.0", path = "../types", features = ["datasize", "json-schema", "std"] }
+casper-types = { version = "7.1.1", path = "../types", features = ["datasize", "json-schema", "std"] }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { version = "1.5.2" }

binary_port/src/error_code.rs

@@ -370,6 +370,8 @@ pub enum ErrorCode {
     InvalidDelegationAmount = 116,
     #[error("the transaction invocation target is unsupported under V2 runtime")]
     UnsupportedInvocationTarget = 117,
+    #[error("the transaction contained an invalid initiator")]
+    InvalidInitiator,
 }
 
 impl TryFrom<u16> for ErrorCode {
@@ -454,6 +456,7 @@ impl From<InvalidDeploy> for ErrorCode {
             }
             InvalidDeploy::InvalidPaymentAmount => ErrorCode::InvalidDeployInvalidPaymentAmount,
             InvalidDeploy::PricingModeNotSupported => ErrorCode::PricingModeNotSupported,
+            InvalidDeploy::InvalidInitiator => ErrorCode::InvalidInitiator,
             _ => ErrorCode::InvalidDeployUnspecified,
         }
     }
@@ -571,6 +574,7 @@ impl From<InvalidTransactionV1> for ErrorCode {
             InvalidTransactionV1::UnsupportedInvocationTarget { .. } => {
                 ErrorCode::UnsupportedInvocationTarget
             }
+            InvalidTransactionV1::InvalidInitiator => ErrorCode::InvalidInitiator,
             _other => ErrorCode::InvalidTransactionUnspecified,
         }
     }

execution_engine/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "casper-execution-engine"
-version = "9.0.0" # when updating, also update 'html_root_url' in lib.rs
+version = "9.0.1" # when updating, also update 'html_root_url' in lib.rs
 authors = ["Henry Till <henrytill@gmail.com>", "Ed Hastings <ed@casperlabs.io>", "Michał Papierski <michal@casper.network>"]
 edition = "2021"
 description = "Casper execution engine crates."
@@ -17,8 +17,8 @@ bincode = "1.3.1"
 blake2 = { version = "0.10.6", default-features = false }
 blake3 = { version = "1.5.0", default-features = false, features = ["pure"] }
 sha2 = { version = "0.10.8", default-features = false }
-casper-storage = { version = "5.0.0", path = "../storage", default-features = true }
-casper-types = { version = "7.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema", "std"] }
+casper-storage = { version = "5.0.1", path = "../storage", default-features = true }
+casper-types = { version = "7.1.1", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema", "std"] }
 casper-wasm = { version = "1.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
 casper-wasm-utils = { version = "4.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
 casper-wasmi = { version = "1.0.0", features = ["sign_ext", "call_indirect_overlong"] }

execution_engine/src/engine_state/wasm_v1.rs

@@ -496,6 +496,11 @@ pub struct WasmV1Result {
     ret: Option<CLValue>,
     /// Tracking copy cache captured during execution.
     cache: Option<TrackingCopyCache>,
+    /// Remaining approved spending limit on the caller's main purse at the end of execution, if
+    /// the runtime context produced one. Used to forward the leftover budget from a
+    /// custom-payment Wasm into the following session phase so a transaction cannot reset its
+    /// approved spending limit twice.
+    remaining_spending_limit: Option<U512>,
 }
 
 impl WasmV1Result {
@@ -520,9 +525,21 @@ impl WasmV1Result {
             error,
             ret,
             cache,
+            remaining_spending_limit: None,
         }
     }
 
+    /// Sets the post-execution remaining spending limit. Builder-style.
+    pub fn with_remaining_spending_limit(mut self, remaining: U512) -> Self {
+        self.remaining_spending_limit = Some(remaining);
+        self
+    }
+
+    /// Returns the post-execution remaining approved spending limit, if captured.
+    pub fn remaining_spending_limit(&self) -> Option<U512> {
+        self.remaining_spending_limit
+    }
+
     /// Error, if any.
     pub fn error(&self) -> Option<&EngineError> {
         self.error.as_ref()
@@ -574,6 +591,7 @@ impl WasmV1Result {
             error: Some(EngineError::RootNotFound(state_hash)),
             ret: None,
             cache: None,
+            remaining_spending_limit: None,
         }
     }
 
@@ -588,6 +606,7 @@ impl WasmV1Result {
             error: Some(error),
             ret: None,
             cache: None,
+            remaining_spending_limit: None,
         }
     }
 
@@ -602,6 +621,7 @@ impl WasmV1Result {
             error: Some(EngineError::InvalidExecutableItem(error)),
             ret: None,
             cache: None,
+            remaining_spending_limit: None,
         }
     }
 
@@ -633,6 +653,7 @@ impl WasmV1Result {
                 error: None,
                 ret: None,
                 cache: Some(cache),
+                remaining_spending_limit: None,
             }),
             TransferResult::Failure(te) => {
                 Some(WasmV1Result {
@@ -644,25 +665,55 @@ impl WasmV1Result {
                     error: Some(EngineError::Transfer(te)),
                     ret: None,
                     cache: None,
+                    remaining_spending_limit: None,
                 })
             }
         }
     }
 
-    /// Checks effects for an AddUInt512 transform to a balance at imputed addr
-    /// and for exactly the imputed amount.
+    /// Returns true if the effects on the balance at `addr` leave its value at >= `amount`.
     pub fn balance_increased_by_amount(&self, addr: URefAddr, amount: U512) -> bool {
+        match self.balance_after_effects(addr) {
+            Some(total) => total >= amount,
+            None => false,
+        }
+    }
+
+    /// Returns the running balance value the effects leave at `addr`, folding `AddUInt512` and
+    /// `Write(CLValue<U512>)` transforms in execution order. Returns `None` if no balance-shape
+    /// effect on this key is observed.
+    ///
+    /// - The payment purse starts each transaction empty (system invariant maintained by
+    ///   audit-082's `Phase::Session` guard on `get_payment_purse`);
+    /// - `mint::transfer` writes the new total balance via `write_balance`, producing a `Write`
+    ///   transform whose CLValue contains the post-transfer purse balance;
+    /// - `mint`'s `add_balance` path produces `AddUInt512`.
+    pub fn balance_after_effects(&self, addr: URefAddr) -> Option<U512> {
         if self.effects.is_empty() || self.effects.transforms().is_empty() {
-            return false;
+            return None;
         }
 
         let key = Key::Balance(addr);
-        if let Some(transform) = self.effects.transforms().iter().find(|x| x.key() == &key) {
-            if let TransformKindV2::AddUInt512(added) = transform.kind() {
-                return *added == amount;
+        let mut total = U512::zero();
+        let mut saw_balance_effect = false;
+        for transform in self.effects.transforms().iter().filter(|x| x.key() == &key) {
+            match transform.kind() {
+                TransformKindV2::AddUInt512(added) => {
+                    saw_balance_effect = true;
+                    total = total.saturating_add(*added);
+                }
+                TransformKindV2::Write(stored) => {
+                    if let Some(cl_value) = stored.as_cl_value() {
+                        if let Ok(written) = cl_value.clone().into_t::<U512>() {
+                            saw_balance_effect = true;
+                            total = written;
+                        }
+                    }
+                }
+                _ => {}
             }
         }
-        false
+        saw_balance_effect.then_some(total)
     }
 }
 

execution_engine/src/execution/executor.rs

@@ -150,6 +150,7 @@ impl Executor {
                 stack,
             ),
         };
+        let remaining_spending_limit = runtime.context().remaining_spending_limit();
         match result {
             Ok(ret) => WasmV1Result::new(
                 gas_limit,
@@ -160,7 +161,8 @@ impl Executor {
                 None,
                 Some(ret),
                 Some(runtime.context().cache()),
-            ),
+            )
+            .with_remaining_spending_limit(remaining_spending_limit),
             Err(error) => WasmV1Result::new(
                 gas_limit,
                 runtime.context().gas_counter(),
@@ -170,7 +172,8 @@ impl Executor {
                 Some(error.into()),
                 None,
                 None,
-            ),
+            )
+            .with_remaining_spending_limit(remaining_spending_limit),
         }
     }
 

execution_engine/src/lib.rs

@@ -1,6 +1,6 @@
 //! The engine which executes smart contracts on the Casper network.
 
-#![doc(html_root_url = "https://docs.rs/casper-execution-engine/9.0.0")]
+#![doc(html_root_url = "https://docs.rs/casper-execution-engine/9.0.1")]
 #![doc(
     html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png",
     html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png",