Skip to content

Commit

Permalink
feat: add support for keccak syscall (without syscall counter incre…
Browse files Browse the repository at this point in the history
…ase)
  • Loading branch information
varex83 committed Oct 23, 2024
1 parent 8052b51 commit cb606a0
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 4 deletions.
45 changes: 42 additions & 3 deletions crates/blockifier/src/execution/native/syscall_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use starknet_types_core::felt::Felt;
use crate::execution::call_info::{CallInfo, OrderedEvent, OrderedL2ToL1Message, Retdata};
use crate::execution::entry_point::{CallEntryPoint, EntryPointExecutionContext};
use crate::execution::native::utils::encode_str_as_felts;
use crate::execution::syscalls::hint_processor::OUT_OF_GAS_ERROR;
use crate::execution::syscalls::hint_processor::{INVALID_INPUT_LENGTH_ERROR, OUT_OF_GAS_ERROR};
use crate::state::state_api::State;

pub struct NativeSyscallHandler<'state> {
Expand Down Expand Up @@ -212,8 +212,47 @@ impl<'state> StarknetSyscallHandler for &mut NativeSyscallHandler<'state> {
todo!("Implement send_message_to_l1 syscall.");
}

fn keccak(&mut self, _input: &[u64], _remaining_gas: &mut u128) -> SyscallResult<U256> {
todo!("Implement keccak syscall.");
fn keccak(&mut self, input: &[u64], remaining_gas: &mut u128) -> SyscallResult<U256> {
self.substract_syscall_gas_cost(remaining_gas, self.context.gas_costs().keccak_gas_cost)?;

const KECCAK_FULL_RATE_IN_WORDS: usize = 17;

let input_length = input.len();
let (n_rounds, remainder) = num_integer::div_rem(input_length, KECCAK_FULL_RATE_IN_WORDS);

if remainder != 0 {
// In VM this error is wrapped into `SyscallExecutionError::SyscallError`
return Err(vec![Felt::from_hex(INVALID_INPUT_LENGTH_ERROR).unwrap()]);
}

// TODO(Ori, 1/2/2024): Write an indicative expect message explaining why the conversion
// works.
let n_rounds_as_u128 = u128::try_from(n_rounds).expect("Failed to convert usize to u128.");
let gas_cost =
n_rounds_as_u128 * u128::from(self.context.gas_costs().keccak_round_cost_gas_cost);

if gas_cost > *remaining_gas {
// In VM this error is wrapped into `SyscallExecutionError::SyscallError`
return Err(vec![Felt::from_hex(OUT_OF_GAS_ERROR).unwrap()]);
}
*remaining_gas -= gas_cost;

// TODO: For the keccak system call we want to count the number of rounds rather than the
// number of syscall invocations.
// self.increment_syscall_count_by(&SyscallSelector::Keccak, n_rounds);

let mut state = [0u64; 25];
for chunk in input.chunks(KECCAK_FULL_RATE_IN_WORDS) {
for (i, val) in chunk.iter().enumerate() {
state[i] ^= val;
}
keccak::f1600(&mut state)
}

Ok(U256 {
hi: u128::from(state[2]) | (u128::from(state[3]) << 64),
lo: u128::from(state[0]) | (u128::from(state[1]) << 64),
})
}

fn secp256k1_new(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::test_utils::contracts::FeatureContract;
use crate::test_utils::initial_test_state::test_state;
use crate::test_utils::{trivial_external_entry_point_new, CairoVersion, BALANCE};

#[test_case(FeatureContract::TestContract(CairoVersion::Native), 265110; "Native")]
#[test_case(FeatureContract::TestContract(CairoVersion::Cairo1), 255110; "VM")]
fn test_keccak(test_contract: FeatureContract, expected_gas: u64) {
let chain_info = &ChainInfo::create_for_testing();
Expand All @@ -22,7 +23,7 @@ fn test_keccak(test_contract: FeatureContract, expected_gas: u64) {
..trivial_external_entry_point_new(test_contract)
};

assert_eq!(
pretty_assertions::assert_eq!(
entry_point_call.execute_directly(&mut state).unwrap().execution,
CallExecution { gas_consumed: expected_gas, ..CallExecution::from_retdata(retdata![]) }
);
Expand Down

0 comments on commit cb606a0

Please sign in to comment.