chore: update to Cairo v2.2.0 (#73)

NethermindEth · Aug 31, 2023 · 761b32e · 761b32e
1 parent 3e9bbe3
commit 761b32e
Show file tree

Hide file tree

Showing 35 changed files with 28 additions and 83 deletions.
diff --git a/.github/workflows/verify-cairo-programs/action.yml b/.github/workflows/verify-cairo-programs/action.yml
@@ -8,7 +8,7 @@ runs:
     - name: Install scarb
       uses: software-mansion/setup-scarb@v1
       with:
-        scarb-version: "0.6.2"
+        scarb-version: "0.7.0"
 
     - name: Run build script
       shell: bash

diff --git a/.github/workflows/verify_cairo_programs.yml b/.github/workflows/verify_cairo_programs.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install scarb
         uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "0.6.2"
+          scarb-version: "0.7.0"
 
       - name: Run build script
         run: |

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-scarb 0.6.2
+scarb 0.7.0
diff --git a/listings/ch00-introduction/calling_other_contracts/Scarb.toml b/listings/ch00-introduction/calling_other_contracts/Scarb.toml
@@ -3,6 +3,6 @@ name = "calling_other_contracts"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/calling_other_contracts/src/callee.cairo b/listings/ch00-introduction/calling_other_contracts/src/callee.cairo
@@ -2,7 +2,7 @@
 mod Callee {
     #[storage]
     struct Storage {
-        value: u128, 
+        value: u128,
     }
 
     #[external(v0)]

diff --git a/listings/ch00-introduction/constructor/Scarb.toml b/listings/ch00-introduction/constructor/Scarb.toml
@@ -3,6 +3,6 @@ name = "constructor"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/constructor/src/lib.cairo b/listings/ch00-introduction/constructor/src/lib.cairo
@@ -4,7 +4,7 @@ mod ExampleConstructor {
 
     #[storage]
     struct Storage {
-        names: LegacyMap::<ContractAddress, felt252>, 
+        names: LegacyMap::<ContractAddress, felt252>,
     }
 
     // The constructor is decorated with a `#[constructor]` attribute.

diff --git a/listings/ch00-introduction/counter/Scarb.toml b/listings/ch00-introduction/counter/Scarb.toml
@@ -3,6 +3,6 @@ name = "counter"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/custom_type_serde/Scarb.toml b/listings/ch00-introduction/custom_type_serde/Scarb.toml
@@ -3,6 +3,6 @@ name = "custom_type_serde"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/errors/Scarb.toml b/listings/ch00-introduction/errors/Scarb.toml
@@ -3,6 +3,6 @@ name = "errors"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/errors/src/custom_errors.cairo b/listings/ch00-introduction/errors/src/custom_errors.cairo
@@ -3,7 +3,6 @@ mod Errors {
     const NOT_NULL: felt252 = 'must not be null';
 }
 
-
 #[starknet::contract]
 mod CustomErrorsExample {
     use super::Errors;

diff --git a/listings/ch00-introduction/errors/src/vault_errors.cairo b/listings/ch00-introduction/errors/src/vault_errors.cairo
@@ -9,7 +9,7 @@ mod VaultErrorsExample {
 
     #[storage]
     struct Storage {
-        balance: u256, 
+        balance: u256,
     }
 
     #[generate_trait]

diff --git a/listings/ch00-introduction/events/Scarb.toml b/listings/ch00-introduction/events/Scarb.toml
@@ -3,6 +3,6 @@ name = "counter"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/interfaces_traits/Scarb.toml b/listings/ch00-introduction/interfaces_traits/Scarb.toml
@@ -3,6 +3,6 @@ name = "interfaces_traits"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/interfaces_traits/src/explicit.cairo b/listings/ch00-introduction/interfaces_traits/src/explicit.cairo
@@ -35,11 +35,7 @@ mod explicit_interface_contract_tests {
     };
     use debug::PrintTrait;
     use starknet::{deploy_syscall, ContractAddress};
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
 
     #[test]
     #[available_gas(2000000000)]

diff --git a/listings/ch00-introduction/interfaces_traits/src/implicit_internal.cairo b/listings/ch00-introduction/interfaces_traits/src/implicit_internal.cairo
@@ -51,13 +51,8 @@ mod implicit_internal_contract_tests {
         IImplicitInternalContract, ImplicitInternalContract, IImplicitInternalContractDispatcher,
         IImplicitInternalContractDispatcherTrait
     };
-    use debug::PrintTrait;
     use starknet::{deploy_syscall, ContractAddress};
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
 
     #[test]
     #[available_gas(2000000000)]

diff --git a/listings/ch00-introduction/mappings/Scarb.toml b/listings/ch00-introduction/mappings/Scarb.toml
@@ -3,6 +3,6 @@ name = "maps"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/mappings/src/test_mappings.cairo b/listings/ch00-introduction/mappings/src/test_mappings.cairo
@@ -10,13 +10,8 @@ trait IMapContract<TContractState> {
 mod tests {
     use maps::mappings::MapContract;
     use super::{IMapContract, IMapContractDispatcher, IMapContractDispatcherTrait};
-    use debug::PrintTrait;
     use starknet::{deploy_syscall, ContractAddress};
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
 
     #[test]
     #[available_gas(2000000000)]

diff --git a/listings/ch00-introduction/storing_custom_types/Scarb.toml b/listings/ch00-introduction/storing_custom_types/Scarb.toml
@@ -3,6 +3,6 @@ name = "storing_custom_types"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/testing/Scarb.toml b/listings/ch00-introduction/testing/Scarb.toml
@@ -3,6 +3,6 @@ name = "tests"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/testing/src/lib.cairo b/listings/ch00-introduction/testing/src/lib.cairo
@@ -57,18 +57,9 @@ mod simple_contract_tests {
         contract_address_const
     };
 
-    // Use debug print trait to be able to print result if needed.
-    use debug::PrintTrait;
-
     // Use starknet test utils to fake the transaction context.
     use starknet::testing::{set_caller_address, set_contract_address};
 
-    use serde::Serde;
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
-    use result::ResultTrait;
-
     // Deploy the contract and return its dispatcher.
     fn deploy(initial_value: u32) -> ISimpleContractDispatcher {
         // Set up constructor arguments.

diff --git a/listings/ch00-introduction/variables/Scarb.toml b/listings/ch00-introduction/variables/Scarb.toml
@@ -3,6 +3,6 @@ name = "variables"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch00-introduction/visibility/Scarb.toml b/listings/ch00-introduction/visibility/Scarb.toml
@@ -3,6 +3,6 @@ name = "visibility"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch01-advanced-concepts/storing_arrays/Scarb.toml b/listings/ch01-advanced-concepts/storing_arrays/Scarb.toml
@@ -3,6 +3,6 @@ name = "storing_arrays"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo b/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo
@@ -1,13 +1,7 @@
-use traits::{Into, TryInto};
-use result::ResultTrait;
-use option::OptionTrait;
-use array::ArrayTrait;
-use array::SpanTrait;
 use starknet::{
     StorageBaseAddress, Store, SyscallResult, storage_read_syscall, storage_write_syscall,
     storage_address_from_base_and_offset
 };
-use debug::PrintTrait;
 
 // ANCHOR: StorageAccessImpl
 impl StoreFelt252Array of Store<Array<felt252>> {
@@ -59,7 +53,7 @@ impl StoreFelt252Array of Store<Array<felt252>> {
         loop {
             match value.pop_front() {
                 Option::Some(element) => {
-                    Store::<felt252>::write_at_offset(address_domain, base, offset, element)?;
+                    Store::<felt252>::write_at_offset(address_domain, base, offset, element);
                     offset += Store::<felt252>::size();
                 },
                 Option::None(_) => {
@@ -109,14 +103,8 @@ trait IStoreArrayContract<TContractState> {
 mod tests {
     use super::StoreArrayContract;
     use super::{IStoreArrayContractDispatcher, IStoreArrayContractDispatcherTrait};
-    use debug::PrintTrait;
     use starknet::deploy_syscall;
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
-    use array::SpanTrait;
 
     #[test]
     #[available_gas(20000000)]

diff --git a/listings/ch01-advanced-concepts/struct_as_mapping_key/Scarb.toml b/listings/ch01-advanced-concepts/struct_as_mapping_key/Scarb.toml
@@ -3,6 +3,6 @@ name = "src"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch01-advanced-concepts/struct_as_mapping_key/src/contract.cairo b/listings/ch01-advanced-concepts/struct_as_mapping_key/src/contract.cairo
@@ -1,12 +1,10 @@
 #[starknet::contract]
 mod PetRegistry {
     use poseidon::poseidon_hash_span;
-    use serde::Serde;
-    use array::ArrayTrait;
 
     #[storage]
     struct Storage {
-        registration_time: LegacyMap::<felt252, u64>, 
+        registration_time: LegacyMap::<felt252, u64>,
     }
 
     #[derive(Copy, Drop, Serde)]

diff --git a/listings/ch01-advanced-concepts/struct_as_mapping_key/src/test.cairo b/listings/ch01-advanced-concepts/struct_as_mapping_key/src/test.cairo
@@ -2,14 +2,8 @@
 mod tests {
     use src::contract::PetRegistry;
     use PetRegistry::Pet;
-    use debug::PrintTrait;
     use starknet::deploy_syscall;
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
-    use array::SpanTrait;
 
     #[starknet::interface]
     trait IPetRegistry<TContractState> {

diff --git a/listings/ch01-advanced-concepts/write_to_any_slot/Scarb.toml b/listings/ch01-advanced-concepts/write_to_any_slot/Scarb.toml
@@ -3,6 +3,6 @@ name = "write_to_any_slot"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch01-advanced-concepts/write_to_any_slot/src/test_write_any_slot.cairo b/listings/ch01-advanced-concepts/write_to_any_slot/src/test_write_any_slot.cairo
@@ -11,13 +11,8 @@ mod tests {
     use super::WriteToAnySlot::{get_address_from_name};
     use super::WriteToAnySlot;
     use super::{IWriteToAnySlotDispatcher, IWriteToAnySlotDispatcherTrait};
-    use debug::PrintTrait;
     use starknet::deploy_syscall;
-    use option::OptionTrait;
-    use array::ArrayTrait;
-    use traits::{Into, TryInto};
     use starknet::class_hash::Felt252TryIntoClassHash;
-    use result::ResultTrait;
 
     #[test]
     #[available_gas(2000000000)]

diff --git a/listings/ch01-advanced-concepts/write_to_any_slot/src/write_any_slot.cairo b/listings/ch01-advanced-concepts/write_to_any_slot/src/write_any_slot.cairo
@@ -1,9 +1,7 @@
 #[starknet::contract]
 mod WriteToAnySlot {
     use starknet::syscalls::{storage_read_syscall, storage_write_syscall};
-    use array::ArrayTrait;
-    use option::OptionTrait;
-    use traits::{Into, TryInto};
+    use starknet::SyscallResultTrait;
     use poseidon::poseidon_hash_span;
     use starknet::storage_access::Felt252TryIntoStorageAddress;
     use starknet::StorageAddress;

diff --git a/listings/ch02-applications/simple_vault/Scarb.toml b/listings/ch02-applications/simple_vault/Scarb.toml
@@ -3,6 +3,6 @@ name = "simple_vault"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch02-applications/upgradeable_contract/Scarb.toml b/listings/ch02-applications/upgradeable_contract/Scarb.toml
@@ -3,6 +3,6 @@ name = "upgradeable_contract"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.1.0"
+starknet = ">=2.2.0"
 
 [[target.starknet-contract]]
diff --git a/listings/ch02-applications/upgradeable_contract/src/upgradeable_contract_v0.cairo b/listings/ch02-applications/upgradeable_contract/src/upgradeable_contract_v0.cairo
@@ -1,9 +1,7 @@
 #[starknet::contract]
 mod UpgradeableContract_V0 {
     use starknet::class_hash::ClassHash;
-    use zeroable::Zeroable;
-    use result::ResultTrait;
-    use starknet::SyscallResult;
+    use starknet::SyscallResultTrait;
 
     #[storage]
     struct Storage {}

diff --git a/listings/ch02-applications/upgradeable_contract/src/upgradeable_contract_v1.cairo b/listings/ch02-applications/upgradeable_contract/src/upgradeable_contract_v1.cairo
@@ -1,9 +1,7 @@
 #[starknet::contract]
 mod UpgradeableContract_V1 {
     use starknet::class_hash::ClassHash;
-    use zeroable::Zeroable;
-    use result::ResultTrait;
-    use starknet::SyscallResult;
+    use starknet::SyscallResultTrait;
 
     #[storage]
     struct Storage {}