chore(deps): bump to latest tempo main (#413)

Author: mattsse

Cargo.lock

@@ -78,79 +78,79 @@ codegen-units = 1
 
 [workspace.dependencies]
 # tempo (from upstream)
-tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4" }
-tempo-chainspec = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-consensus = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false, features = ["serde"] }
-tempo-evm = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-node = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4" }
-tempo-payload-types = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-precompiles = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-precompiles-macros = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4" }
-tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false, features = [
+tempo-alloy = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651" }
+tempo-chainspec = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-consensus = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-contracts = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false, features = ["serde"] }
+tempo-evm = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-node = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651" }
+tempo-payload-types = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-precompiles = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-precompiles-macros = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651" }
+tempo-primitives = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false, features = [
   "reth",
   "serde",
   "serde-bincode-compat",
   "reth-codec",
 ] }
-tempo-revm = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
-tempo-transaction-pool = { git = "https://github.com/tempoxyz/tempo", rev = "e331e2f488a368ea9ca76c422e12fedbfb6eb3b4", default-features = false }
+tempo-revm = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
+tempo-transaction-pool = { git = "https://github.com/tempoxyz/tempo", rev = "bb08bb905b6ee13fafe046aa9531aea2cdf60651", default-features = false }
 
 # zones
 zone-precompiles = { path = "crates/precompiles", default-features = false }
 zone-primitives = { path = "crates/primitives", default-features = false }
 zone-rpc = { path = "crates/rpc" }
 
 # reth
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-primitives-traits = { version = "0.1.0", default-features = false }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", features = [
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-primitives-traits = { version = "0.3.0", default-features = false }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057", features = [
   "std",
   "optional-checks",
 ] }
-reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" }
-revm = { version = "36.0.0", features = ["optional_fee_charge"] }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "0b33057" }
+revm = { version = "37.0.0", features = ["optional_fee_charge"], default-features = false }
 
 # alloy
-alloy = { version = "1.6.1", default-features = false }
-alloy-consensus = { version = "1.6.1", default-features = false }
-alloy-contract = { version = "1.6.1", default-features = false }
-alloy-eips = { version = "1.8.3", default-features = false }
-alloy-evm = "0.29.2"
-alloy-network = { version = "1.6.1", default-features = false }
+alloy = { version = "2.0.0", default-features = false }
+alloy-consensus = { version = "2.0.0", default-features = false }
+alloy-contract = { version = "2.0.0", default-features = false }
+alloy-eips = { version = "2.0.0", default-features = false }
+alloy-evm = { version = "0.32.0", default-features = false }
+alloy-network = { version = "2.0.0", default-features = false }
 alloy-primitives = { version = "1.5.7", default-features = false }
-alloy-provider = { version = "1.6.1", default-features = false }
-alloy-rlp = { version = "0.3.13", default-features = false }
-alloy-rpc-client = "1.6.1"
-alloy-rpc-types-engine = "1.8.3"
-alloy-rpc-types-eth = { version = "1.8.3" }
-alloy-signer = "1.6.1"
-alloy-signer-local = "1.6.1"
+alloy-provider = { version = "2.0.0", default-features = false }
+alloy-rlp = { version = "0.3.15", default-features = false }
+alloy-rpc-client = "2.0.0"
+alloy-rpc-types-engine = "2.0.0"
+alloy-rpc-types-eth = { version = "2.0.0" }
+alloy-signer = "2.0.0"
+alloy-signer-local = "2.0.0"
 alloy-sol-types = { version = "1.5.7", default-features = false }
-alloy-transport = "1.6.1"
+alloy-transport = "2.0.0"
 
 # commonware
 commonware-codec = "2026.2.0"

Cargo.toml

@@ -20,14 +20,14 @@ tempo-contracts = { workspace = true, default-features = false }
 tempo-precompiles = { workspace = true, default-features = false }
 tempo-precompiles-macros.workspace = true
 
-# alloy (direct versions for no_std — workspace versions have default-features = true)
-alloy = { version = "1.6.1", default-features = false }
-alloy-evm = { version = "0.29.2", default-features = false }
-alloy-primitives = { version = "1.5.7", default-features = false }
-alloy-sol-types = { version = "1.5.7", default-features = false }
+# alloy
+alloy = { workspace = true, default-features = false }
+alloy-evm = { workspace = true, default-features = false }
+alloy-primitives = { workspace = true, default-features = false }
+alloy-sol-types = { workspace = true, default-features = false }
 
 # revm
-revm = { version = "36.0.0", default-features = false }
+revm = { workspace = true, default-features = false }
 
 # crypto
 aes-gcm = { version = "0.10.3", default-features = false, features = ["aes", "alloc"] }

crates/precompiles/Cargo.toml

@@ -16,7 +16,7 @@ use aes_gcm::{
 use alloy_evm::precompiles::{DynPrecompile, Precompile, PrecompileInput};
 use alloy_primitives::{Address, Bytes, address};
 use alloy_sol_types::SolCall;
-use revm::precompile::{PrecompileError, PrecompileId, PrecompileOutput, PrecompileResult};
+use revm::precompile::{PrecompileId, PrecompileOutput, PrecompileResult};
 use tracing::{debug, warn};
 
 /// AES-256-GCM Decrypt precompile address on Zone L2.
@@ -57,19 +57,21 @@ impl Precompile for AesGcmDecrypt {
     fn call(&self, input: PrecompileInput<'_>) -> PrecompileResult {
         let data = input.data;
         if data.len() < 4 {
-            return Ok(PrecompileOutput::new_reverted(0, Bytes::new()));
+            return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir));
         }
 
         let selector: [u8; 4] = data[..4].try_into().expect("len >= 4");
         if selector != decryptCall::SELECTOR {
             warn!(target: "zone::precompile", ?selector, "AesGcmDecrypt: unknown selector");
-            return Ok(PrecompileOutput::new_reverted(0, Bytes::new()));
+            return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir));
         }
 
         debug!(target: "zone::precompile", "AesGcmDecrypt: decrypt");
 
-        let call = decryptCall::abi_decode(data)
-            .map_err(|_| PrecompileError::other("ABI decode failed"))?;
+        let call = match decryptCall::abi_decode(data) {
+            Ok(call) => call,
+            Err(_) => return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir)),
+        };
 
         let gas = AES_GCM_BASE_GAS + AES_GCM_PER_BYTE_GAS * call.ciphertext.len() as u64;
 
@@ -86,7 +88,7 @@ impl Precompile for AesGcmDecrypt {
             valid,
         };
         let encoded = decryptCall::abi_encode_returns(&ret);
-        Ok(PrecompileOutput::new(gas, encoded.into()))
+        Ok(PrecompileOutput::new(gas, encoded.into(), input.reservoir))
     }
 }
 

crates/precompiles/src/aes_gcm.rs

@@ -20,7 +20,7 @@ use k256::{
         sec1::{FromEncodedPoint, ToEncodedPoint},
     },
 };
-use revm::precompile::{PrecompileError, PrecompileId, PrecompileOutput, PrecompileResult};
+use revm::precompile::{PrecompileId, PrecompileOutput, PrecompileResult};
 use tracing::{debug, warn};
 
 /// Chaum-Pedersen Verify precompile address on Zone L2.
@@ -73,19 +73,21 @@ impl Precompile for ChaumPedersenVerify {
     fn call(&self, input: PrecompileInput<'_>) -> PrecompileResult {
         let data = input.data;
         if data.len() < 4 {
-            return Ok(PrecompileOutput::new_reverted(0, Bytes::new()));
+            return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir));
         }
 
         let selector: [u8; 4] = data[..4].try_into().expect("len >= 4");
         if selector != verifyProofCall::SELECTOR {
             warn!(target: "zone::precompile", ?selector, "ChaumPedersenVerify: unknown selector");
-            return Ok(PrecompileOutput::new_reverted(0, Bytes::new()));
+            return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir));
         }
 
         debug!(target: "zone::precompile", "ChaumPedersenVerify: verifyProof");
 
-        let call = verifyProofCall::abi_decode(data)
-            .map_err(|_| PrecompileError::other("ABI decode failed"))?;
+        let call = match verifyProofCall::abi_decode(data) {
+            Ok(call) => call,
+            Err(_) => return Ok(PrecompileOutput::revert(0, Bytes::new(), input.reservoir)),
+        };
 
         let valid = verify_chaum_pedersen(
             &call.ephemeralPubX.0,
@@ -99,7 +101,11 @@ impl Precompile for ChaumPedersenVerify {
         );
 
         let encoded = verifyProofCall::abi_encode_returns(&valid);
-        Ok(PrecompileOutput::new(CP_VERIFY_GAS, encoded.into()))
+        Ok(PrecompileOutput::new(
+            CP_VERIFY_GAS,
+            encoded.into(),
+            input.reservoir,
+        ))
     }
 }
 

crates/precompiles/src/chaum_pedersen.rs

@@ -93,8 +93,8 @@ pub fn compute_ecdh_proof(
     Some(EcdhProofResult {
         shared_secret: B256::from(shared_secret_x),
         shared_secret_y_parity,
-        cp_proof_s: B256::from(s.to_repr().as_ref()),
-        cp_proof_c: B256::from(c.to_repr().as_ref()),
+        cp_proof_s: B256::from_slice(s.to_repr().as_ref()),
+        cp_proof_c: B256::from_slice(c.to_repr().as_ref()),
     })
 }
 

crates/precompiles/src/ecies.rs

@@ -14,11 +14,9 @@
 //! Only [`ZONE_INBOX_ADDRESS`] may call this precompile; all other callers are
 //! reverted with `OnlyZoneInbox()`.
 
-use alloc::format;
-
 use alloy_primitives::{Address, Bytes};
 use alloy_sol_types::{SolCall, SolError};
-use revm::precompile::{PrecompileError, PrecompileOutput, PrecompileResult};
+use revm::precompile::PrecompileResult;
 use tempo_precompiles::{
     PATH_USD_ADDRESS, Precompile as TempoPrecompile, TIP20_FACTORY_ADDRESS,
     tip20::{ISSUER_ROLE, TIP20Token},
@@ -98,15 +96,17 @@ impl ZoneTokenFactory {
             PrecompileId::Custom("ZoneTokenFactory".into()),
             move |input| {
                 if !input.is_direct_call() {
-                    return Ok(PrecompileOutput::new_reverted(
+                    return Ok(PrecompileOutput::revert(
                         0,
                         SolError::abi_encode(&DelegateCallNotAllowed {}).into(),
+                        input.reservoir,
                     ));
                 }
 
                 let mut storage = EvmPrecompileStorageProvider::new(
                     input.internals,
                     input.gas,
+                    input.reservoir,
                     spec,
                     input.is_static,
                     gas_params.clone(),
@@ -120,19 +120,21 @@ impl ZoneTokenFactory {
 
 impl TempoPrecompile for ZoneTokenFactory {
     fn call(&mut self, calldata: &[u8], msg_sender: Address) -> PrecompileResult {
+        let storage = tempo_precompiles::storage::StorageCtx;
+
         if msg_sender != ZONE_INBOX_ADDRESS {
-            return Ok(PrecompileOutput::new_reverted(
-                0,
-                OnlyZoneInbox {}.abi_encode().into(),
-            ));
+            return Ok(storage.revert_output(OnlyZoneInbox {}.abi_encode().into()));
         }
 
-        let call = enableTokenCall::abi_decode(calldata)
-            .map_err(|_| PrecompileError::other("ABI decode failed"))?;
+        let call = match enableTokenCall::abi_decode(calldata) {
+            Ok(call) => call,
+            Err(_) => return Ok(storage.revert_output(Bytes::new())),
+        };
 
-        self.enable_token(call)
-            .map_err(|e| PrecompileError::other(format!("{e}")))?;
+        if let Err(err) = self.enable_token(call) {
+            return storage.error_result(err);
+        }
 
-        Ok(PrecompileOutput::new(0, Bytes::new()))
+        Ok(storage.success_output(Bytes::new()))
     }
 }