diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index 9c5b944f..a7c01cec 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -84,14 +84,6 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/mpt/storage/storage_read.asm"), include_str!("asm/mpt/storage/storage_write.asm"), include_str!("asm/mpt/util.asm"), - include_str!("asm/ripemd/box.asm"), - include_str!("asm/ripemd/compression.asm"), - include_str!("asm/ripemd/constants.asm"), - include_str!("asm/ripemd/functions.asm"), - include_str!("asm/ripemd/main.asm"), - include_str!("asm/ripemd/memory.asm"), - include_str!("asm/ripemd/update.asm"), - include_str!("asm/rlp/encode.asm"), include_str!("asm/rlp/decode.asm"), include_str!("asm/rlp/encode.asm"), include_str!("asm/rlp/encode_rlp_string.asm"), diff --git a/evm/src/cpu/kernel/constants/mod.rs b/evm/src/cpu/kernel/constants/mod.rs index 24c8ae6d..ef97ff5a 100644 --- a/evm/src/cpu/kernel/constants/mod.rs +++ b/evm/src/cpu/kernel/constants/mod.rs @@ -19,9 +19,8 @@ pub(crate) mod txn_fields; pub fn evm_constants() -> HashMap { let mut c = HashMap::new(); - let hex_constants = MISC_CONSTANTS + let hex_constants = EC_CONSTANTS .iter() - .chain(EC_CONSTANTS.iter()) .chain(HASH_CONSTANTS.iter()) .cloned(); for (name, value) in hex_constants { @@ -54,15 +53,12 @@ pub fn evm_constants() -> HashMap { c } -const MISC_CONSTANTS: [(&str, [u8; 32]); 1] = [ - // 2^64 +const HASH_CONSTANTS: [(&str, [u8; 32]); 2] = [ + // Hash of an empty string: keccak(b'').hex() ( - "BLAKE_WORD_SIZE", - hex!("0000000000000000000000000000000000000000000000010000000000000000"), + "EMPTY_STRING_HASH", + hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"), ), -]; - -const HASH_CONSTANTS: [(&str, [u8; 32]); 1] = [ // Hash of an empty node: keccak(rlp.encode(b'')).hex() ( "EMPTY_NODE_HASH",