diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index dda006e6..115679ea 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -38,6 +38,12 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/memory/metadata.asm"), include_str!("asm/memory/packing.asm"), include_str!("asm/memory/txn_fields.asm"), + include_str!("asm/ripemd/compression.asm"), + include_str!("asm/ripemd/constants.asm"), + include_str!("asm/ripemd/memory.asm"), + include_str!("asm/ripemd/ripemd.asm"), + include_str!("asm/ripemd/subroutines.asm"), + include_str!("asm/ripemd/update.asm"), include_str!("asm/rlp/encode.asm"), include_str!("asm/rlp/decode.asm"), include_str!("asm/rlp/read_to_memory.asm"), diff --git a/evm/src/cpu/kernel/tests/ripemd.rs b/evm/src/cpu/kernel/tests/ripemd.rs index 0d0dee5a..4bff5a40 100644 --- a/evm/src/cpu/kernel/tests/ripemd.rs +++ b/evm/src/cpu/kernel/tests/ripemd.rs @@ -1,3 +1,4 @@ +use std::env; use anyhow::Result; use ethereum_types::U256; @@ -6,10 +7,16 @@ use crate::cpu::kernel::interpreter::run; #[test] fn test_ripemd() -> Result<()> { + + env::set_var("RUST_BACKTRACE", "1"); + + let expected = "0xf71c27109c692c1b56bbdceb5b9d2865b3708dbc"; + println!("{}", expected); + let kernel = combined_kernel(); let ripemd = kernel.global_labels["ripemd_alt"]; - let input = vec![ + let input: Vec = vec![ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, @@ -23,10 +30,7 @@ fn test_ripemd() -> Result<()> { let hashed = run(&kernel.code, ripemd, initial_stack, &kernel.prover_inputs)?; let result = hashed.stack()[1]; let actual = format!("{:X}", result); - println!("{}", actual); - let expected = "0xf71c27109c692c1b56bbdceb5b9d2865b3708dbc"; - println!("{}", expected); assert_eq!(expected, actual); Ok(())