feat: bump revm

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

Author: greged93

Cargo.lock

@@ -453,19 +453,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
 reth-ress-provider = { path = "crates/ress/provider" }
 
 # revm
-revm = { version = "20.0.0-alpha.5", default-features = false }
-revm-bytecode = { version = "1.0.0-alpha.3", default-features = false }
-revm-database = { version = "1.0.0-alpha.3", default-features = false }
-revm-state = { version = "1.0.0-alpha.3", default-features = false }
-revm-primitives = { version = "16.0.0-alpha.3", default-features = false }
-revm-interpreter = { version = "16.0.0-alpha.5", default-features = false }
-revm-inspector = { version = "1.0.0-alpha.5", default-features = false }
-revm-context = { version = "1.0.0-alpha.4", default-features = false }
-revm-context-interface = { version = "1.0.0-alpha.4", default-features = false }
-revm-database-interface = { version = "1.0.0-alpha.3", default-features = false }
-op-revm = { version = "1.0.0-alpha.4", default-features = false }
-# TODO(scroll): point to main
-revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", branch = "feat/bump-revm" }
+revm = { version = "20.0.0-alpha.6", default-features = false }
+revm-bytecode = { version = "1.0.0-alpha.4", default-features = false }
+revm-database = { version = "1.0.0-alpha.4", default-features = false }
+revm-state = { version = "1.0.0-alpha.4", default-features = false }
+revm-primitives = { version = "16.0.0-alpha.4", default-features = false }
+revm-interpreter = { version = "16.0.0-alpha.6", default-features = false }
+revm-inspector = { version = "1.0.0-alpha.6", default-features = false }
+revm-context = { version = "1.0.0-alpha.5", default-features = false }
+revm-context-interface = { version = "1.0.0-alpha.5", default-features = false }
+revm-database-interface = { version = "1.0.0-alpha.4", default-features = false }
+op-revm = { version = "1.0.0-alpha.5", default-features = false }
+revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm" }
 revm-inspectors = "0.17.0-alpha.1"
 
 # eth

Cargo.toml

@@ -165,19 +165,33 @@ impl reth_codecs::Compact for Bytecode {
 
         use compact_ids::*;
 
-        let len = buf.read_u32::<byteorder::BigEndian>().expect("could not read bytecode length");
-        let bytes = Bytes::from(buf.copy_to_bytes(len as usize));
+        let len = buf.read_u32::<byteorder::BigEndian>().expect("could not read bytecode length")
+            as usize;
+        let bytes = Bytes::from(buf.copy_to_bytes(len));
         let variant = buf.read_u8().expect("could not read bytecode variant");
         let decoded = match variant {
             LEGACY_RAW_BYTECODE_ID => Self(RevmBytecode::new_raw(bytes)),
             REMOVED_BYTECODE_ID => {
                 unreachable!("Junk data in database: checked Bytecode variant was removed")
             }
-            LEGACY_ANALYZED_BYTECODE_ID => Self(RevmBytecode::new_analyzed(
-                bytes,
-                buf.read_u64::<byteorder::BigEndian>().unwrap() as usize,
-                revm_bytecode::JumpTable::from_slice(buf),
-            )),
+            LEGACY_ANALYZED_BYTECODE_ID => {
+                let original_len = buf.read_u64::<byteorder::BigEndian>().unwrap() as usize;
+                // When saving jumptable, its length is getting aligned to u8 boundary. Thus, we
+                // need to re-calculate the internal length of bitvec and truncate it when loading
+                // jumptables to avoid inconsistencies during `Compact` roundtrip.
+                let jump_table_len = if buf.len() * 8 >= bytes.len() {
+                    // Use length of padded bytecode if we can fit it
+                    bytes.len()
+                } else {
+                    // Otherwise, use original_len
+                    original_len
+                };
+                Self(RevmBytecode::new_analyzed(
+                    bytes,
+                    original_len,
+                    revm_bytecode::JumpTable::from_slice(buf, jump_table_len),
+                ))
+            }
             EOF_BYTECODE_ID | EIP7702_BYTECODE_ID => {
                 // EOF and EIP-7702 bytecode objects will be decoded from the raw bytecode
                 Self(RevmBytecode::new_raw(bytes))
@@ -293,7 +307,7 @@ mod tests {
         let bytecode = Bytecode(RevmBytecode::LegacyAnalyzed(LegacyAnalyzedBytecode::new(
             Bytes::from(&hex!("ff00")),
             2,
-            JumpTable::from_slice(&[0]),
+            JumpTable::from_slice(&[0], 2),
         )));
         let len = bytecode.to_compact(&mut buf);
         assert_eq!(len, 16);

crates/primitives-traits/src/account.rs

@@ -62,6 +62,7 @@ exceptions = [
     # These dependencies are grandfathered in https://github.com/paradigmxyz/reth/pull/6980
     { allow = ["MPL-2.0"], name = "option-ext" },
     { allow = ["MPL-2.0"], name = "webpki-roots" },
+    { allow = ["MPL-2.0"], name = "webpki-root-certs" },
 ]
 
 # Skip the poseidon-bn254, bn254 and zktrie crates for license verification. We should at some point publish a license for them.