diff --git a/Cargo.lock b/Cargo.lock index 502c4b6bac..1f8dad123f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5848,7 +5848,7 @@ dependencies = [ [[package]] name = "op-revm" version = "4.0.2" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "auto_impl", "once_cell", @@ -10242,7 +10242,7 @@ dependencies = [ [[package]] name = "revm" version = "23.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "revm-bytecode", "revm-context", @@ -10260,7 +10260,7 @@ dependencies = [ [[package]] name = "revm-bytecode" version = "4.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "bitvec", "once_cell", @@ -10272,7 +10272,7 @@ dependencies = [ [[package]] name = "revm-context" version = "4.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "cfg-if", "derive-where", @@ -10287,7 +10287,7 @@ dependencies = [ [[package]] name = "revm-context-interface" version = "4.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -10302,7 +10302,7 @@ dependencies = [ [[package]] name = "revm-database" version = "4.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "alloy-eips", "revm-bytecode", @@ -10315,7 +10315,7 @@ dependencies = [ [[package]] name = "revm-database-interface" version = "4.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "auto_impl", "revm-primitives", @@ -10326,7 +10326,7 @@ dependencies = [ [[package]] name = "revm-handler" version = "4.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "auto_impl", "revm-bytecode", @@ -10343,7 +10343,7 @@ dependencies = [ [[package]] name = "revm-inspector" version = "4.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "auto_impl", "revm-context", @@ -10378,7 +10378,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "19.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -10389,7 +10389,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "20.1.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -10413,7 +10413,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "19.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "alloy-primitives", "num_enum", @@ -10423,7 +10423,7 @@ dependencies = [ [[package]] name = "revm-state" version = "4.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "bitflags 2.9.1", "revm-bytecode", @@ -11095,7 +11095,7 @@ dependencies = [ [[package]] name = "seismic-revm" version = "1.0.0" -source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a#f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a" +source = "git+https://github.com/SeismicSystems/seismic-revm.git?rev=b65a166a#b65a166ad480ef00b3341bb9c5466757bfc08afc" dependencies = [ "auto_impl", "hkdf", diff --git a/Cargo.toml b/Cargo.toml index d6a2a062ed..9ab4901df8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -770,18 +770,18 @@ alloy-dyn-abi = { git = "https://github.com/SeismicSystems/seismic-alloy-core.gi alloy-trie = { git = "https://github.com/SeismicSystems/seismic-trie.git", rev = "417644c" } # revm -revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-bytecode = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-database = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-state = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-primitives = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-interpreter = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-inspector = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-context = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-context-interface = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -revm-database-interface = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -op-revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} -seismic-revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "f3dde53ca8f0bc6e482db09f606fd3f8ce699c1a"} +revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-bytecode = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-database = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-state = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-primitives = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-interpreter = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-inspector = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-context = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-context-interface = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +revm-database-interface = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +op-revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} +seismic-revm = { git = "https://github.com/SeismicSystems/seismic-revm.git", rev = "b65a166a"} revm-inspectors = { git = "https://github.com/SeismicSystems/seismic-revm-inspectors.git", rev = "2b50433"} diff --git a/crates/stages/stages/src/stages/merkle.rs b/crates/stages/stages/src/stages/merkle.rs index 6de7d7c05a..bfc58793e5 100644 --- a/crates/stages/stages/src/stages/merkle.rs +++ b/crates/stages/stages/src/stages/merkle.rs @@ -578,7 +578,7 @@ mod tests { } let storage = storage_entries .into_iter() - .filter(|v| !v.value.is_zero()) + .filter(|v| !v.to_flagged_storage().is_zero()) .map(|v| (v.key, v.value)) .collect::>(); accounts.insert(key, (account, storage)); diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index cfc0226d16..7dea01b60f 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -2021,7 +2021,7 @@ impl StateWriter } } - if !entry.value.is_zero() { + if !entry.to_flagged_storage().is_zero() { storages_cursor.upsert(address, &entry)?; } }