Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of eth_get_transaction_count function #983

Merged
merged 7 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions crates/contracts/src/kakarot_core/eth_rpc.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ pub impl EthRPC<
}

fn eth_get_transaction_count(self: @TContractState, address: EthAddress) -> u64 {
panic!("unimplemented")
let kakarot_state = KakarotState::get_state();
Gerson2102 marked this conversation as resolved.
Show resolved Hide resolved
let starknet_address = kakarot_state.get_starknet_address(address);
println!("starknet_address: {:?}", starknet_address);
let account = IAccountDispatcher { contract_address: starknet_address };
let nonce = account.get_nonce();
nonce
}

fn eth_chain_id(self: @TContractState) -> u64 {
Expand Down Expand Up @@ -225,9 +230,12 @@ mod tests {
use crate::kakarot_core::eth_rpc::IEthRPC;
use crate::kakarot_core::interface::IExtendedKakarotCoreDispatcherTrait;
use crate::test_utils::{setup_contracts_for_testing, fund_account_with_native_token};
use evm::test_utils::{sequencer_evm_address, evm_address};
use snforge_std::{start_cheat_chain_id_global, stop_cheat_chain_id_global};
use evm::test_utils::{sequencer_evm_address, evm_address, uninitialized_account};
use snforge_std::{
start_mock_call, start_cheat_chain_id_global, stop_cheat_chain_id_global, test_address
};
use utils::constants::POW_2_53;
use utils::helpers::compute_starknet_address;

fn set_up() -> KakarotCore::ContractState {
// Define the kakarot state to access contract functions
Expand All @@ -240,6 +248,19 @@ mod tests {
stop_cheat_chain_id_global();
}

#[test]
fn test_eth_get_transaction_count() {
let kakarot_state = set_up();
// Deployed eoa should return a zero nonce
let starknet_address = compute_starknet_address(
test_address(),
evm_address(),
0.try_into().unwrap() // Using 0 as the kakarot storage is empty
);
start_mock_call::<u256>(starknet_address, selector!("get_nonce"), 1);
assert_eq!(kakarot_state.eth_get_transaction_count(evm_address()), 1);
}

#[test]
fn test_eth_get_balance() {
let (native_token, kakarot_core) = setup_contracts_for_testing();
Expand Down
3 changes: 3 additions & 0 deletions crates/contracts/src/kakarot_core/interface.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ pub trait IExtendedKakarotCore<TContractState> {
/// Executes an EVM transaction and possibly modifies the state
fn eth_send_transaction(ref self: TContractState, tx: Transaction) -> (bool, Span<u8>, u64);

// Returns the transaction count (nonce) of the specified address
fn eth_get_transaction_count(self: @TContractState, address: EthAddress) -> u64;

/// Upgrade the KakarotCore smart contract
/// Using replace_class_syscall
fn upgrade(ref self: TContractState, new_class_hash: ClassHash);
Expand Down
Loading