update cairo-native and starknet 2.5.4 (#1243)

* update sir with native gas fix

* upd makefile

* update cairo2 programs

* add source

* fix tests

* update deps

* fix test

* fix more tests

* fix another test

* fix test

* fix test

* try to fix test

Author: edg-l

Cargo.lock

@@ -23,24 +23,24 @@ members = [
 ]
 
 [workspace.dependencies]
-cairo-lang-casm = "=2.5.3"
-cairo-lang-sierra = "=2.5.3"
-cairo-lang-starknet = "=2.5.3"
-cairo-lang-utils = "=2.5.3"
-cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "1f98feff566dd2da016e439f5e8db912c6e39872", features = ["cairo-1-hints"] }
+cairo-lang-casm = "=2.5.4"
+cairo-lang-sierra = "=2.5.4"
+cairo-lang-starknet = "=2.5.4"
+cairo-lang-utils = "=2.5.4"
+cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "3547089579dd74f815edbc2d1caa91e00fc8a2f7", features = ["cairo-1-hints"] }
 num-traits = "0.2.15"
-starknet = "0.5.0"
-starknet_api = {version = "0.7.0-dev.0"}
+starknet = "0.7.0" # todo: update to 0.9.0+ once cairo-lang is 2.6.0+
+starknet_api = "0.7.0-dev.0" # todo: update to 0.9.0+ once cairo-lang is 2.6.0+
 thiserror = "1.0.32"
 
 [dependencies]
-anyhow = "1.0.66"
+anyhow = "1.0"
 base64 = { version = "0.21.0", default-features = false, features = ["alloc"] }
 cairo-lang-casm = { workspace = true }
 cairo-lang-sierra = { workspace = true }
 cairo-lang-starknet = { workspace = true }
 cairo-lang-utils = { workspace = true }
-cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "96ea3a37180a194ba14c3b21788b09e76bb634fd", optional = true }
+cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "baf57d2dde0036ac4848fc40c672826fb7ffcde4", optional = true }
 k256 = "0.13.3"
 p256 = "0.13.2"
 sec1 = "0.7.3"

Cargo.toml

@@ -123,7 +123,7 @@ $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra
 compile-cairo-2-sierra: $(CAIRO_2_COMPILED_SIERRA_CONTRACTS)
 compile-cairo-2-casm: $(CAIRO_2_COMPILED_CASM_CONTRACTS)
 
-CAIRO_2_VERSION=2.4.2
+CAIRO_2_VERSION=2.5.4
 
 cairo-repo-2-dir = cairo2
 cairo-repo-2-dir-macos = cairo2-macos

Makefile

@@ -11,9 +11,15 @@ trait IAccount<T> {
   fn is_valid_signature(self: @T, hash: felt252, signature: Array<felt252>) -> felt252;
   fn supports_interface(self: @T, interface_id: felt252) -> bool;
   fn public_key(self: @T) -> felt252;
+  fn __validate__(ref self: T, calls: Array<Call>) -> felt252;
+    fn __execute__(ref self: T, calls: Array<Call>) -> Array<Span<felt252>>;
+    fn __validate_declare__(self: @T, class_hash: felt252) -> felt252;
+    fn __validate_deploy__(
+        self: @T, class_hash: felt252, salt: felt252, public_key: felt252,
+    ) -> felt252;
 }
 
-#[starknet::contract]
+#[starknet::contract(account)]
 mod Account {
   use super::{Call, IAccount, SUPPORTED_TX_VERSION};
   use starknet::{get_caller_address, call_contract_syscall, get_tx_info, VALIDATED};
@@ -36,7 +42,7 @@ mod Account {
     self.public_key.write(public_key);
   }
 
-  #[external(v0)]
+  #[abi(embed_v0)]
   impl AccountImpl of IAccount<ContractState> {
     fn is_valid_signature(self: @ContractState, hash: felt252, signature: Array<felt252>) -> felt252 {
       let is_valid = self.is_valid_signature_bool(hash, signature.span());
@@ -50,11 +56,7 @@ mod Account {
     fn public_key(self: @ContractState) -> felt252 {
       self.public_key.read()
     }
-  }
 
-  #[external(v0)]
-  #[generate_trait]
-  impl ProtocolImpl of ProtocolTrait {
     fn __execute__(ref self: ContractState, calls: Array<Call>) -> Array<Span<felt252>> {
       let arr = ArrayTrait::new();
       panic_with_felt252('panic');
@@ -64,7 +66,7 @@ mod Account {
       // self.execute_multiple_calls(calls)
     }
 
-    fn __validate__(self: @ContractState, calls: Array<Call>) -> felt252 {
+    fn __validate__(ref self: ContractState, calls: Array<Call>) -> felt252 {
       panic_with_felt252('panic');
       0
 //      self.only_protocol();
@@ -116,7 +118,7 @@ mod Account {
 
     fn execute_single_call(self: @ContractState, call: Call) -> Span<felt252> {
       let Call{to, selector, calldata} = call;
-      call_contract_syscall(to, selector, calldata.span()).unwrap()
+      call_contract_syscall(to, selector, calldata).unwrap()
     }
 
     fn execute_multiple_calls(self: @ContractState, mut calls: Array<Call>) -> Array<Span<felt252>> {

starknet_programs/cairo2/account_panic.cairo

@@ -1,3 +1,9 @@
+#[starknet::interface]
+trait IContractTrait<TContractState> {
+    fn return_42(ref self: TContractState) -> felt252;
+    fn return_44(ref self: TContractState) -> felt252;
+}
+
 #[starknet::contract]
 mod Callee {
     #[storage]
@@ -10,13 +16,14 @@ mod Callee {
         self.balance.write(initial_balance);
     }
 
-    #[external(v0)]
-    fn return_42(ref self: ContractState) -> felt252 {
-        42
-    }
+    #[abi(embed_v0)]
+    impl IContractTrait of super::IContractTrait<ContractState> {
+        fn return_42(ref self: ContractState) -> felt252 {
+            42
+        }
 
-    #[external(v0)]
-    fn return_44(ref self: ContractState) -> felt252 {
-        44
+        fn return_44(ref self: ContractState) -> felt252 {
+            44
+        }
     }
-}
+}

starknet_programs/cairo2/callee.cairo

@@ -1,3 +1,8 @@
+#[starknet::interface]
+trait IContractTrait<TContractState> {
+    fn call_callee_contract(ref self: TContractState, function_selector: felt252) -> felt252;
+}
+
 #[starknet::contract]
 mod Caller {
     use starknet::call_contract_syscall;
@@ -9,11 +14,14 @@ mod Caller {
         balance: felt252,
     }
 
-     #[external(v0)]
-    fn call_callee_contract(ref self: ContractState, function_selector: felt252) ->  felt252 {
-        let calldata: Array<felt252> = ArrayTrait::new();
-        let callee_addr = starknet::get_contract_address();
-        let return_data =  call_contract_syscall(callee_addr, function_selector, calldata.span()).unwrap();
-        *return_data.get(0_usize).unwrap().unbox()
-    }  
+    #[abi(embed_v0)]
+    impl IContractTrait of super::IContractTrait<ContractState> {
+        fn call_callee_contract(ref self: ContractState, function_selector: felt252) -> felt252 {
+            let calldata: Array<felt252> = ArrayTrait::new();
+            let callee_addr = starknet::get_contract_address();
+            let return_data = call_contract_syscall(callee_addr, function_selector, calldata.span())
+                .unwrap();
+            *return_data.get(0_usize).unwrap().unbox()
+        }
+    }
 }

starknet_programs/cairo2/caller.cairo

@@ -10,15 +10,15 @@ mod ContractA {
 
     #[storage]
     struct Storage {
-        value: u128, 
+        value: u128,
     }
 
     #[constructor]
     fn constructor(ref self: ContractState, value_: u128) {
         self.value.write(value_);
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ContractA of super::IContractA<ContractState> {
         fn foo(ref self: ContractState, a: u128) -> u128 {
             let value = self.value.read();

starknet_programs/cairo2/contract_a.cairo

@@ -21,7 +21,7 @@ mod DeployTest {
     struct Storage {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DeployTest of super::IDeployTest<ContractState> {
         fn deploy_test(self: @ContractState, class_hash: ClassHash, contract_address_salt: felt252) -> ContractAddress {
             let mut calldata = ArrayTrait::new();

starknet_programs/cairo2/deploy.cairo

@@ -14,7 +14,7 @@ mod Deploy {
     struct Storage {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl Deploy of super::IDeploy<ContractState> {
         fn deploy_no_args(self: @ContractState, class_hash: ClassHash) -> felt252 {
             let calldata = ArrayTrait::new();

starknet_programs/cairo2/deploy_contract_no_args.cairo

@@ -20,7 +20,7 @@ mod DeployTest {
     struct Storage {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DeployTest of super::IDeployTest<ContractState> {
         fn deploy_test(self: @ContractState, class_hash: ClassHash, contract_address_salt: felt252, recipient: felt252, name: felt252, decimals: felt252, initial_supply: felt252, symbol: felt252) -> (core::starknet::contract_address::ContractAddress, core::array::Span::<core::felt252>) {
             let mut calldata = ArrayTrait::new();

starknet_programs/cairo2/deploy_erc20.cairo

@@ -20,7 +20,7 @@ mod DeployTest {
     struct Storage {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DeployWithConstructorTest of super::IDeployWithConstructorTest<ContractState> {
         fn deploy_test(self: @ContractState, class_hash: felt252, contract_address_salt: felt252, address: felt252, value: felt252) -> ContractAddress {
             let mut calldata = ArrayTrait::new();

starknet_programs/cairo2/deploy_with_constructor.cairo

@@ -19,7 +19,7 @@ mod DeployTest {
     struct Storage {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DeployWithoutConstructorTest of super::IDeployWithoutConstructorTest<ContractState> {
         fn deploy_test(self: @ContractState, class_hash: felt252, contract_address_salt: felt252) -> ContractAddress {
             let mut calldata = ArrayTrait::new();

starknet_programs/cairo2/deploy_without_constructor.cairo

@@ -1,3 +1,8 @@
+#[starknet::interface]
+trait IEcho<TContractState> {
+    fn echo(ref self: TContractState, value: felt252) -> felt252;
+}
+
 #[starknet::contract]
 mod Echo {
     #[storage]
@@ -10,8 +15,11 @@ mod Echo {
         self.balance.write(initial_balance);
     }
 
-    #[external(v0)]
-    fn echo(ref self: ContractState, value: felt252) -> felt252 {
-        value
+    #[abi(embed_v0)]
+    impl IEcho of super::IEcho<ContractState> {
+        #[abi(per_item)]
+        fn echo(ref self: ContractState, value: felt252) -> felt252 {
+            value
+        }
     }
-}
+}

starknet_programs/cairo2/echo.cairo

@@ -1,3 +1,10 @@
+#[starknet::interface]
+trait IContractTrait<TContractState> {
+    fn call_echo_contract(
+        ref self: TContractState, function_selector: felt252, value: felt252
+    ) -> felt252;
+}
+
 #[starknet::contract]
 mod EchoCaller {
     use starknet::call_contract_syscall;
@@ -9,12 +16,17 @@ mod EchoCaller {
         balance: felt252,
     }
 
-     #[external(v0)]
-    fn call_echo_contract(ref self: ContractState, function_selector: felt252, value: felt252) ->  felt252 {
-        let mut calldata: Array<felt252> = ArrayTrait::new();
-        calldata.append(value);
-        let callee_addr = starknet::get_contract_address();
-        let return_data =  call_contract_syscall(callee_addr, function_selector, calldata.span()).unwrap();
-        *return_data.get(0_usize).unwrap().unbox()
-    }  
+    #[abi(embed_v0)]
+    impl IContractTrait of super::IContractTrait<ContractState> {
+        fn call_echo_contract(
+            ref self: ContractState, function_selector: felt252, value: felt252
+        ) -> felt252 {
+            let mut calldata: Array<felt252> = ArrayTrait::new();
+            calldata.append(value);
+            let callee_addr = starknet::get_contract_address();
+            let return_data = call_contract_syscall(callee_addr, function_selector, calldata.span())
+                .unwrap();
+            *return_data.get(0_usize).unwrap().unbox()
+        }
+    }
 }

starknet_programs/cairo2/echo_caller.cairo

@@ -21,7 +21,7 @@ mod EventTest {
     }
 
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl EventTest of super::IEventTest<ContractState> {
         fn trigger_events(ref self: ContractState) -> () {
             self.emit(Event::EmitEvent(EmitEvent { n: 1 }));

starknet_programs/cairo2/emit_event.cairo

@@ -1,3 +1,5 @@
+// source: https://github.com/starkware-libs/cairo/blob/main/crates/cairo-lang-starknet/cairo_level_tests/contracts/erc20.cairo
+
 use starknet::ContractAddress;
 
 #[starknet::interface]
@@ -80,7 +82,7 @@ mod erc_20 {
             );
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl IERC20Impl of super::IERC20<ContractState> {
         fn get_name(self: @ContractState) -> felt252 {
             self.name.read()
@@ -168,8 +170,8 @@ mod erc_20 {
         fn spend_allowance(
             ref self: ContractState, owner: ContractAddress, spender: ContractAddress, amount: felt252
         ) {
-            let current_allowance = self.allowances.read((owner, spender));
-            let ONES_MASK = 0xffffffffffffffffffffffffffffffff_u128;
+            let _current_allowance = self.allowances.read((owner, spender));
+            let _ONES_MASK = 0xffffffffffffffffffffffffffffffff_u128;
             // let is_unlimited_allowance = current_allowance.low == ONES_MASK
             //     && current_allowance.high == ONES_MASK;
             // if !is_unlimited_allowance {

starknet_programs/cairo2/erc20.cairo

@@ -1,3 +1,9 @@
+#[starknet::interface]
+trait IContractTrait<TContractState> {
+    fn trigger_event(ref self: TContractState) -> felt252;
+}
+
+
 #[starknet::contract]
 mod EventTest {
     use starknet::syscalls::emit_event_syscall;
@@ -15,16 +21,18 @@ mod EventTest {
 
     #[derive(Drop, starknet::Event)]
     struct EmitEvent {
-        n: u128, 
+        n: u128,
     }
 
-    #[external(v0)]
-    fn trigger_event(ref self: ContractState) -> felt252 {
-        let mut keys = ArrayTrait::new();
-        keys.append('n');
-        let mut values = ArrayTrait::new();
-        values.append(1);
-        emit_event_syscall(keys.span(), values.span()).unwrap();
-        1234
+    #[abi(embed_v0)]
+    impl IContractTrait of super::IContractTrait<ContractState> {
+        fn trigger_event(ref self: ContractState) -> felt252 {
+            let mut keys = ArrayTrait::new();
+            keys.append('n');
+            let mut values = ArrayTrait::new();
+            values.append(1);
+            emit_event_syscall(keys.span(), values.span()).unwrap();
+            1234
+        }
     }
 }

starknet_programs/cairo2/event_emitter.cairo

@@ -20,12 +20,12 @@ mod ContractWithEvent {
     use starknet::info::get_contract_address;
     #[storage]
     struct Storage {
-        value: u128, 
+        value: u128,
     }
 
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct IncrementalEvent {
-        value: u128, 
+        value: u128,
     }
 
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
@@ -43,7 +43,7 @@ mod ContractWithEvent {
         self.value.write(0);
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     fn emit_event(ref self: ContractState, incremental: bool) {
         if incremental {
             self.emit(Event::IncrementalEvent(IncrementalEvent { value: self.value.read() }));

starknet_programs/cairo2/events.cairo

@@ -18,7 +18,7 @@ mod ExampleContract {
     fn constructor(ref self: ContractState) {
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ExampleContract of super::IExampleContract<ContractState> {
         fn get_balance(ref self: ContractState) -> u128 {
             self.balance.read()