Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Add recursive calls tests using library_call & call_contract syscalls #1072

Merged
merged 10 commits into from
Oct 24, 2023
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
24 changes: 24 additions & 0 deletions starknet_programs/cairo1/square_root_recursive.cairo
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#[abi]
trait Math {
#[external]
fn square_root(n: felt252) -> felt252;
}

#[contract]
mod SquareRoot {
use super::MathDispatcherTrait;
use super::MathLibraryDispatcher;
use starknet::ClassHash;

#[external]
fn square_root_recursive(n: felt252, math_class_hash: ClassHash, n_iterations: u32) -> felt252 {
square_root_recursive_inner(n, math_class_hash, n_iterations)
}

fn square_root_recursive_inner(n: felt252, math_class_hash: ClassHash, n_iterations: u32) -> felt252 {
if n_iterations == 0 {
return n;
}
square_root_recursive_inner(MathLibraryDispatcher {class_hash: math_class_hash}.square_root(n), math_class_hash, n_iterations - 1)
}
}
9 changes: 9 additions & 0 deletions starknet_programs/cairo1/wallet_wrapper.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,13 @@ mod WalletWrapper {
fn increase_balance(amount: felt252, simple_wallet_contract_address: ContractAddress) {
SimpleWalletDispatcher {contract_address: simple_wallet_contract_address}.increase_balance(amount)
}

#[external]
fn increase_balance_recursive(amount: felt252, simple_wallet_contract_address: ContractAddress) {
if amount == 0 {
return();
}
SimpleWalletDispatcher {contract_address: simple_wallet_contract_address}.increase_balance(1);
increase_balance_recursive(amount - 1, simple_wallet_contract_address)
}
}
37 changes: 37 additions & 0 deletions starknet_programs/cairo2/square_root_recursive.cairo
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
use starknet::ClassHash;

#[starknet::interface]
trait Math<TContractState> {
fn square_root(self: @TContractState, n: felt252) -> felt252;
}

#[starknet::interface]
trait ISquareRoot<TContractState> {
fn square_root(self: @TContractState, n: felt252, math_class_hash: ClassHash, n_iterations: u32) -> felt252;
}


#[starknet::contract]
mod SquareRoot {
use super::MathDispatcherTrait;
use super::MathLibraryDispatcher;
use starknet::ClassHash;

#[storage]
struct Storage{
}

#[external(v0)]
impl SquareRoot of super::ISquareRoot<ContractState> {
fn square_root(self: @ContractState, n: felt252, math_class_hash: ClassHash, n_iterations: u32) -> felt252 {
square_root_recursive_inner(n, math_class_hash, n_iterations)
}
}

fn square_root_recursive_inner(n: felt252, math_class_hash: ClassHash, n_iterations: u32) -> felt252 {
if n_iterations == 0 {
return n;
}
square_root_recursive_inner(MathLibraryDispatcher {class_hash: math_class_hash}.square_root(n), math_class_hash, n_iterations - 1)
}
}
14 changes: 13 additions & 1 deletion starknet_programs/cairo2/wallet_wrapper.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ trait SimpleWallet<TContractState> {
#[starknet::interface]
trait IWalletWrapper<TContractState> {
fn get_balance(self: @TContractState, simple_wallet_contract_address: starknet::ContractAddress) -> felt252;
fn increase_balance(ref self: TContractState, amount: felt252, simple_wallet_contract_address: starknet::ContractAddress);
fn increase_balance(ref self: TContractState, amount: felt252, simple_wallet_contract_address: starknet::ContractAddress);
fn increase_balance_recursive(ref self: TContractState, amount: felt252, simple_wallet_contract_address: starknet::ContractAddress);
}

#[starknet::contract]
Expand All @@ -28,5 +29,16 @@ mod WalletWrapper {
fn increase_balance(ref self: ContractState, amount: felt252, simple_wallet_contract_address: ContractAddress) {
SimpleWalletDispatcher {contract_address: simple_wallet_contract_address}.increase_balance(amount)
}
fn increase_balance_recursive(ref self: ContractState, amount: felt252, simple_wallet_contract_address: ContractAddress) {
increase_balance_recursive_inner(amount, simple_wallet_contract_address)
}
}

fn increase_balance_recursive_inner(amount: felt252, simple_wallet_contract_address: ContractAddress) {
if amount == 0 {
return();
}
SimpleWalletDispatcher {contract_address: simple_wallet_contract_address}.increase_balance(1);
increase_balance_recursive_inner(amount - 1, simple_wallet_contract_address)
}
}
Loading