refactor: fix warnings post cairo bump

.tool-versions

@@ -1 +1 @@
-scarb nightly-2023-11-22
+scarb nightly-2023-11-25

crates/alexandria_storage/src/list.cairo

@@ -124,7 +124,7 @@ trait ListTrait<T> {
     /// The storage is not actually cleared, only the length is set to 0.
     /// The values can still be accessible using low-level syscalls, but cannot
     /// be accessed through the list interface.
-    fn clean(ref self: List<T>);
+    fn clean(ref self: List<T>) -> SyscallResult<()>;
 
     /// Removes and returns the first element of the List.
     ///
@@ -226,9 +226,9 @@ impl ListImpl<T, +Copy<T>, +Drop<T>, +Store<T>> of ListTrait<T> {
     }
 
     #[inline(always)]
-    fn clean(ref self: List<T>) {
+    fn clean(ref self: List<T>) -> SyscallResult<()> {
         self.len = 0;
-        Store::write(self.address_domain, self.base, self.len);
+        Store::write(self.address_domain, self.base, self.len)
     }
 
     fn pop_front(ref self: List<T>) -> SyscallResult<Option<T>> {

crates/contracts/src/components/upgradeable.cairo

@@ -32,7 +32,7 @@ mod upgradeable_component {
         fn upgrade_contract(
             ref self: ComponentState<TContractState>, new_class_hash: starknet::ClassHash
         ) {
-            starknet::replace_class_syscall(new_class_hash);
+            starknet::replace_class_syscall(new_class_hash).expect('replace class failed');
             self.emit(ContractUpgraded { new_class_hash: new_class_hash });
         }
     }

crates/contracts/src/contract_account.cairo

@@ -164,7 +164,7 @@ mod ContractAccount {
             )
                 .expect(BYTECODE_WRITE_ERROR);
             let mut stored_list: List<bytes31> = ListTrait::new(0, data_address);
-            stored_list.append_span(packed_bytecode.data.span());
+            stored_list.append_span(packed_bytecode.data.span()).expect('failed to store bytecode');
         }
 
         fn storage_at(self: @ContractState, key: u256) -> u256 {

crates/contracts/src/eoa.cairo

@@ -131,13 +131,13 @@ mod ExternallyOwnedAccount {
             let call = calls.at(0);
             let calldata = call.calldata.span().try_into_bytes().expect('conversion failed');
 
-            let EthereumTransaction{nonce,
+            let EthereumTransaction{nonce: _nonce,
             gas_price,
             gas_limit,
             destination,
             amount,
             calldata,
-            chain_id } =
+            chain_id: _chain_id } =
                 EthTransactionTrait::decode(
                 calldata.span()
             )

crates/contracts/src/kakarot_core/kakarot.cairo

@@ -289,7 +289,7 @@ mod KakarotCore {
             // part of the Kakarot system and thus deployed by the main Kakarot contract
             // itself.
 
-            let (caller_account_type, caller_starknet_address) = self
+            let (caller_account_type, _) = self
                 .address_registry(origin.evm)
                 .expect('Fetching EOA failed');
             assert(caller_account_type == AccountType::EOA, 'Caller is not an EOA');
@@ -298,7 +298,7 @@ mod KakarotCore {
                 .handle_call(:origin, :to, :gas_limit, :gas_price, :value, :calldata);
             match maybe_exec_result {
                 Result::Ok(mut result) => {
-                    result.state.commit_state();
+                    result.state.commit_state().expect('Committing state failed');
                     if to.is_none() {
                         // Overwrite return_data with deployed address
                         return result.address.evm.to_bytes().span();

crates/contracts/src/tests/test_contract_account.cairo

@@ -5,7 +5,7 @@ use evm::tests::test_utils::{ca_address, native_token};
 
 #[test]
 fn test_ca_deploy() {
-    let (native_token, kakarot_core) = setup_contracts_for_testing();
+    let (_, kakarot_core) = setup_contracts_for_testing();
     let ca_address = deploy_contract_account(ca_address(), Default::default().span());
     let contract_account = IContractAccountDispatcher { contract_address: ca_address.starknet };
 
@@ -19,7 +19,7 @@ fn test_ca_deploy() {
 
 #[test]
 fn test_ca_bytecode() {
-    let (native_token, kakarot_core) = setup_contracts_for_testing();
+    setup_contracts_for_testing();
     let bytecode = counter_evm_bytecode();
     let ca_address = deploy_contract_account(ca_address(), bytecode);
     let contract_account = IContractAccountDispatcher { contract_address: ca_address.starknet };
@@ -31,7 +31,7 @@ fn test_ca_bytecode() {
 
 #[test]
 fn test_ca_nonce() {
-    let (native_token, kakarot_core) = setup_contracts_for_testing();
+    setup_contracts_for_testing();
     let ca_address = deploy_contract_account(ca_address(), Default::default().span());
     let contract_account = IContractAccountDispatcher { contract_address: ca_address.starknet };
 
@@ -49,7 +49,7 @@ fn test_ca_nonce() {
 
 #[test]
 fn test_ca_storage() {
-    let (native_token, kakarot_core) = setup_contracts_for_testing();
+    setup_contracts_for_testing();
     let ca_address = deploy_contract_account(ca_address(), Default::default().span());
     let contract_account = IContractAccountDispatcher { contract_address: ca_address.starknet };
 

crates/contracts/src/tests/test_eoa.cairo

@@ -56,10 +56,8 @@ mod test_external_owned_account {
     #[test]
     #[available_gas(2000000000)]
     fn test_evm_address() {
-        let owner = contract_address_const::<1>();
         let expected_address: EthAddress = eoa_address();
-        let (_, kakarot) = setup_contracts_for_testing();
-        let kakarot_address = kakarot.contract_address;
+        setup_contracts_for_testing();
 
         let eoa_contract = deploy_eoa(eoa_address());
 
@@ -69,8 +67,7 @@ mod test_external_owned_account {
     #[test]
     #[available_gas(2000000000)]
     fn test_eoa_upgrade() {
-        let (_, kakarot) = setup_contracts_for_testing();
-        let kakarot_address = kakarot.contract_address;
+        setup_contracts_for_testing();
         let eoa_contract = deploy_eoa(eoa_address());
 
         let new_class_hash: ClassHash = MockContractUpgradeableV1::TEST_CLASS_HASH
@@ -92,8 +89,7 @@ mod test_external_owned_account {
     #[available_gas(2000000000)]
     #[should_panic(expected: ('Caller not self', 'ENTRYPOINT_FAILED'))]
     fn test_eoa_upgrade_from_noncontractaddress() {
-        let (_, kakarot) = setup_contracts_for_testing();
-        let kakarot_address = kakarot.contract_address;
+        setup_contracts_for_testing();
         let eoa_contract = deploy_eoa(eoa_address());
         let new_class_hash: ClassHash = MockContractUpgradeableV1::TEST_CLASS_HASH
             .try_into()
@@ -112,7 +108,7 @@ mod test_external_owned_account {
 
         let kakarot_address = kakarot_core.contract_address;
 
-        let account = deploy_contract_account(other_evm_address(), counter_evm_bytecode());
+        deploy_contract_account(other_evm_address(), counter_evm_bytecode());
 
         set_contract_address(eoa);
         let eoa_contract = AccountContractDispatcher { contract_address: eoa };
@@ -143,7 +139,7 @@ mod test_external_owned_account {
             calldata: encoded_tx.to_felt252_array()
         };
 
-        let result = eoa_contract.__execute__(array![call]);
+        eoa_contract.__execute__(array![call]);
 
         // check counter value has increased
         let return_data = kakarot_core
@@ -163,8 +159,7 @@ mod test_external_owned_account {
     #[available_gas(2000000000)]
     #[should_panic(expected: ('calls length is not 1', 'ENTRYPOINT_FAILED'))]
     fn test___execute___should_fail_with_zero_calls() {
-        let (_, kakarot) = setup_contracts_for_testing();
-        let kakarot_address = kakarot.contract_address;
+        setup_contracts_for_testing();
 
         let eoa_contract = deploy_eoa(eoa_address());
         let eoa_contract = AccountContractDispatcher {

crates/contracts/src/tests/test_kakarot_core.cairo

@@ -91,7 +91,7 @@ fn test_kakarot_core_set_native_token() {
 
 #[test]
 fn test_kakarot_core_deploy_eoa() {
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     let eoa_starknet_address = kakarot_core.deploy_eoa(test_utils::evm_address());
     // We drop the first event of Kakarot Core, as it is the initializer from Ownable,
     // triggered in the constructor
@@ -105,7 +105,7 @@ fn test_kakarot_core_deploy_eoa() {
 #[test]
 fn test_kakarot_core_eoa_mapping() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     assert(
         kakarot_core.address_registry(test_utils::evm_address()).is_none(),
         'should be uninitialized'
@@ -165,7 +165,7 @@ fn test_kakarot_core_upgrade_contract() {
 #[test]
 fn test_kakarot_contract_account_nonce() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     let address = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), Default::default().span()
     );
@@ -180,7 +180,7 @@ fn test_kakarot_contract_account_nonce() {
 #[test]
 fn test_kakarot_contract_account_storage_at() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     let address = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), Default::default().span()
     );
@@ -199,7 +199,7 @@ fn test_kakarot_contract_account_storage_at() {
 #[test]
 fn test_kakarot_contract_account_bytecode() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     let address = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), counter_evm_bytecode()
     );
@@ -215,7 +215,7 @@ fn test_kakarot_contract_account_bytecode() {
 #[should_panic(expected: ('unimplemented', 'ENTRYPOINT_FAILED'))]
 fn test_kakarot_contract_account_false_positive_jumpdest() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
     let address = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), Default::default().span()
     );
@@ -234,7 +234,7 @@ fn test_kakarot_contract_account_false_positive_jumpdest() {
 #[test]
 fn test_eth_send_transaction() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
 
     let evm_address = test_utils::evm_address();
     let eoa = kakarot_core.deploy_eoa(evm_address);
@@ -288,10 +288,10 @@ fn test_eth_send_transaction() {
 #[test]
 fn test_eth_call() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
 
     let evm_address = test_utils::evm_address();
-    let eoa = kakarot_core.deploy_eoa(evm_address);
+    kakarot_core.deploy_eoa(evm_address);
 
     let account = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), counter_evm_bytecode()
@@ -317,12 +317,12 @@ fn test_eth_call() {
 #[test]
 fn test_handle_call() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
-    let mut kakarot_core = KakarotCore::unsafe_new_contract_state();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
 
     let evm_address = test_utils::evm_address();
     let eoa = kakarot_core.deploy_eoa(evm_address);
-    let account = contract_utils::deploy_contract_account(
+
+    let _account = contract_utils::deploy_contract_account(
         test_utils::other_evm_address(), counter_evm_bytecode()
     );
 
@@ -356,7 +356,7 @@ fn test_handle_call() {
 #[test]
 fn test_eth_send_transaction_deploy_tx() {
     // Given
-    let (native_token, kakarot_core) = contract_utils::setup_contracts_for_testing();
+    let (_, kakarot_core) = contract_utils::setup_contracts_for_testing();
 
     let evm_address = test_utils::evm_address();
     let eoa = kakarot_core.deploy_eoa(evm_address);
@@ -385,9 +385,7 @@ fn test_eth_send_transaction_deploy_tx() {
     testing::set_contract_address(kakarot_core.contract_address);
     let kakarot_state = KakarotCore::unsafe_new_contract_state();
     let computed_sn_addr = kakarot_state.compute_starknet_address(expected_address);
-    let CA = IContractAccountDispatcher {
-        contract_address: kakarot_state.compute_starknet_address(expected_address)
-    };
+    let CA = IContractAccountDispatcher { contract_address: computed_sn_addr };
     let bytecode = CA.bytecode();
     assert(bytecode == counter_evm_bytecode(), 'wrong bytecode');
 

crates/contracts/src/tests/test_ownable.cairo

@@ -75,7 +75,7 @@ fn test_assert_only_owner_not_owner() {
     let mut ownable: TestingState = TestingStateTrait::new_with(OWNER());
     testing::set_caller_address(OTHER());
 
-    let result = ownable.assert_only_owner();
+    ownable.assert_only_owner();
 }
 
 #[test]
@@ -84,7 +84,7 @@ fn test_assert_only_owner_zero() {
     let mut ownable: TestingState = TestingStateTrait::new_with(OWNER());
     testing::set_caller_address(ZERO());
 
-    let result = ownable.assert_only_owner();
+    ownable.assert_only_owner();
 }
 
 #[test]

crates/contracts/src/tests/test_uninitialized_account.cairo

@@ -46,7 +46,7 @@ fn test_account_initialize() {
 #[test]
 #[should_panic(expected: ('Caller not Kakarot Core address', 'ENTRYPOINT_FAILED'))]
 fn test_eoa_upgrade_from_nonkakarot() {
-    let (native_token, kakarot_core) = setup_contracts_for_testing();
+    let (_, kakarot_core) = setup_contracts_for_testing();
     let account = deploy_account(kakarot_core.contract_address);
     set_contract_address(kakarot_address());
     let new_class_hash: ClassHash = MockContractUpgradeableV1::TEST_CLASS_HASH.try_into().unwrap();

crates/contracts/src/tests/test_utils.cairo

@@ -31,7 +31,7 @@ fn pop_log<T, impl TDrop: Drop<T>, impl TEvent: starknet::Event<T>>(
     let (mut keys, mut data) = testing::pop_log_raw(address)?;
 
     // Remove the event ID from the keys
-    keys.pop_front();
+    keys.pop_front().expect('pop_log popfront failed');
 
     let ret = starknet::Event::deserialize(ref keys, ref data);
     assert(data.is_empty(), 'Event has extra data');
@@ -40,7 +40,7 @@ fn pop_log<T, impl TDrop: Drop<T>, impl TEvent: starknet::Event<T>>(
 
 /// Author: Openzeppelin https://github.com/OpenZeppelin/cairo-contracts
 fn drop_event(address: ContractAddress) {
-    testing::pop_log_raw(address);
+    testing::pop_log_raw(address).unwrap();
 }
 
 /// Author: Openzeppelin https://github.com/OpenZeppelin/cairo-contracts

crates/evm/src/create_helpers.cairo

@@ -150,7 +150,6 @@ impl MachineCreateHelpersImpl of MachineCreateHelpers {
             // Success
             Status::Stopped => {
                 let mut return_data = self.return_data();
-                let mut i = 0;
 
                 let mut account = self.state.get_account(account_address);
                 account.set_code(return_data);
@@ -159,12 +158,12 @@ impl MachineCreateHelpersImpl of MachineCreateHelpers {
                     'type should be CA in finalize'
                 );
                 self.state.set_account(account);
-                self.return_to_parent_ctx();
+                self.return_to_parent_ctx()?;
                 self.stack.push(account_address.into())
             },
             // Failure
             Status::Reverted => {
-                self.return_to_parent_ctx();
+                self.return_to_parent_ctx()?;
                 self.stack.push(0)
             },
         }

crates/evm/src/execution.cairo

@@ -73,7 +73,7 @@ fn execute(
 
     let transfer = Transfer { sender: origin, recipient: target, amount: value };
     match machine.state.add_transfer(transfer) {
-        Result::Ok(x) => {},
+        Result::Ok(_) => {},
         Result::Err(err) => { return reverted_with_err(machine, err); }
     }
 
@@ -102,7 +102,7 @@ fn reverted_with_err(mut machine: Machine, error: EVMError) -> ExecutionResult {
     ExecutionResult {
         address: machine.address(),
         status: Status::Reverted,
-        return_data: Default::default().span(),
+        return_data: return_data,
         state: machine.state,
     }
 }

crates/evm/src/instructions/environmental_information.cairo

@@ -217,7 +217,7 @@ impl EnvironmentInformationImpl of EnvironmentInformationTrait {
                     return Result::Err(EVMError::ReturnDataError(RETURNDATA_OUT_OF_BOUNDS_ERROR));
                 }
             },
-            Result::Err(x) => {
+            Result::Err(_) => {
                 return Result::Err(EVMError::ReturnDataError(RETURNDATA_OUT_OF_BOUNDS_ERROR));
             }
         }