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

[KGA-19] feat: add new_call_contract_syscall to Cairo1Helpers class #1023

Merged
merged 1 commit into from
Nov 20, 2024
Merged
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
45 changes: 41 additions & 4 deletions crates/contracts/src/cairo1_helpers.cairo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use core::starknet::{EthAddress, secp256_trait::Signature};
use core::starknet::{EthAddress, secp256_trait::Signature, ContractAddress};

#[starknet::interface]
pub trait IPrecompiles<T> {
Expand Down Expand Up @@ -88,7 +88,7 @@ pub trait IHelpers<T> {
/// * The recovered Ethereum address.
fn recover_eth_address(self: @T, msg_hash: u256, signature: Signature) -> (bool, EthAddress);

/// Performs signature verification in the secp256r1 ellipitic curve.
/// Performs signature verification in the secp256r1 elliptic curve.
///
/// # Arguments
///
Expand All @@ -103,20 +103,41 @@ pub trait IHelpers<T> {
fn verify_signature_secp256r1(
self: @T, msg_hash: u256, r: u256, s: u256, x: u256, y: u256
) -> bool;


/// Calls a contract using the new Cairo call_contract_syscall.
///
/// Meant to be used from Cairo Zero classes that want to be able to manage the return value of
/// the call.
/// Only applicable from Starknet v0.13.4 and onwwards.
///
/// # Arguments
///
/// * `to` - The address of the contract to call.
/// * `selector` - The selector of the function to call.
/// * `calldata` - The calldata to pass to the function.
///
/// # Returns
/// A tuple containing:
/// * A boolean indicating whether the call was successful.
/// * The output of the call.
fn new_call_contract_syscall(
ref self: T, to: ContractAddress, selector: felt252, calldata: Span<felt252>
) -> (bool, Span<felt252>);
}


pub mod embeddable_impls {
use core::keccak::{cairo_keccak, keccak_u256s_be_inputs};
use core::num::traits::Zero;
use core::starknet::EthAddress;
use core::starknet::eth_signature::{verify_eth_signature};
use core::starknet::secp256_trait::{
Signature, recover_public_key, Secp256PointTrait, is_valid_signature
};
use core::starknet::secp256_trait::{Secp256Trait};
use core::starknet::secp256k1::Secp256k1Point;
use core::starknet::secp256r1::{Secp256r1Point};
use core::starknet::{ContractAddress, EthAddress};
use core::traits::Into;
use core::{starknet, starknet::SyscallResultTrait};
use evm::errors::EVMError;
Expand Down Expand Up @@ -149,7 +170,7 @@ pub mod embeddable_impls {
}

#[starknet::embeddable]
pub impl Helpers<TContractState> of super::IHelpers<TContractState> {
pub impl Helpers<TContractState, +Drop<TContractState>> of super::IHelpers<TContractState> {
fn get_block_hash(self: @TContractState, block_number: u64) -> felt252 {
starknet::syscalls::get_block_hash_syscall(block_number).unwrap_syscall()
}
Expand Down Expand Up @@ -217,6 +238,22 @@ pub mod embeddable_impls {

return is_valid_signature(msg_hash, r, s, public_key);
}

fn new_call_contract_syscall(
ref self: TContractState,
obatirou marked this conversation as resolved.
Show resolved Hide resolved
to: ContractAddress,
selector: felt252,
calldata: Span<felt252>
) -> (bool, Span<felt252>) {
// Note: until Starknet v0.13.4, the transaction will fail if the call reverted.
let result = starknet::syscalls::call_contract_syscall(to, selector, calldata);
match result {
Result::Ok(output) => { return (true, output); },
// This will need to be manually tested and enabled once contract calls can be
// handled.
Result::Err(error) => { return panic(error); }
}
}
}
}

Expand Down
Loading