From 656258c7937ff01581aea4ba895792a1c689ebb6 Mon Sep 17 00:00:00 2001 From: Wolfgang Welz Date: Thu, 30 Jan 2025 12:15:34 +0100 Subject: [PATCH] upgrade risc0-ethereum-trie --- Cargo.lock | 2 +- crates/core/src/mpt.rs | 4 ++-- guests/reth-ethereum/Cargo.lock | 2 +- guests/reth-optimism/Cargo.lock | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cc298e4..69f380fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4791,7 +4791,7 @@ dependencies = [ [[package]] name = "risc0-ethereum-trie" version = "0.1.0" -source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#c39c05720ebfccff520ae380ee906395d8858669" +source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#3d55234f24147b547b6aeab69ef79b14c7c93f20" dependencies = [ "alloy-primitives", "alloy-rlp", diff --git a/crates/core/src/mpt.rs b/crates/core/src/mpt.rs index 6d72cc41..eb0d0c23 100644 --- a/crates/core/src/mpt.rs +++ b/crates/core/src/mpt.rs @@ -56,7 +56,7 @@ impl MptNode { key: K, post_state_proof: impl IntoIterator, unresolvable: &mut B256Set, - ) -> alloy_rlp::Result<()> + ) -> anyhow::Result<()> where K: AsRef<[u8]>, N: AsRef<[u8]>, @@ -68,7 +68,7 @@ impl MptNode { let key = B256::right_padding_from(&prefix.pack()); unresolvable.insert(key); } - Err(orphan::Error::RlpError(err)) => return Err(err), + Err(err) => return Err(err.into()), }; Ok(()) diff --git a/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index 347fbc00..7b9053ee 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -3407,7 +3407,7 @@ dependencies = [ [[package]] name = "risc0-ethereum-trie" version = "0.1.0" -source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#c39c05720ebfccff520ae380ee906395d8858669" +source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#3d55234f24147b547b6aeab69ef79b14c7c93f20" dependencies = [ "alloy-primitives", "alloy-rlp", diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index 174cc070..c326a17e 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -3447,7 +3447,7 @@ dependencies = [ [[package]] name = "risc0-ethereum-trie" version = "0.1.0" -source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#7fa3505fef029200251e8110f87656c0e9ddbd39" +source = "git+https://github.com/risc0/risc0-ethereum?branch=feat/trie#3d55234f24147b547b6aeab69ef79b14c7c93f20" dependencies = [ "alloy-primitives", "alloy-rlp",