From 105ee339aec5075af186d89713c91fe2c7a6876a Mon Sep 17 00:00:00 2001 From: julio4 Date: Tue, 10 Oct 2023 17:24:38 +0900 Subject: [PATCH] chore: update to cairo v2.3.0-rc0 --- .github/workflows/verify-cairo-programs/action.yml | 2 +- .github/workflows/verify_cairo_programs.yml | 2 +- .tool-versions | 2 +- Scarb.toml | 2 +- listings/ch00-introduction/calling_other_contracts/Scarb.toml | 2 +- listings/ch00-introduction/constructor/Scarb.toml | 2 +- listings/ch00-introduction/counter/Scarb.toml | 2 +- listings/ch00-introduction/custom_type_serde/Scarb.toml | 2 +- listings/ch00-introduction/errors/Scarb.toml | 2 +- listings/ch00-introduction/errors/src/custom_errors.cairo | 1 - listings/ch00-introduction/events/Scarb.toml | 2 +- listings/ch00-introduction/interfaces_traits/Scarb.toml | 2 +- listings/ch00-introduction/mappings/Scarb.toml | 2 +- listings/ch00-introduction/storing_custom_types/Scarb.toml | 2 +- listings/ch00-introduction/testing/Scarb.toml | 2 +- listings/ch00-introduction/variables/Scarb.toml | 2 +- listings/ch00-introduction/visibility/Scarb.toml | 2 +- listings/ch01-advanced-concepts/storing_arrays/Scarb.toml | 2 +- .../storing_arrays/src/storing_arrays.cairo | 4 +--- .../ch01-advanced-concepts/struct_as_mapping_key/Scarb.toml | 2 +- listings/ch01-advanced-concepts/write_to_any_slot/Scarb.toml | 2 +- listings/ch02-applications/simple_vault/Scarb.toml | 2 +- listings/ch02-applications/upgradeable_contract/Scarb.toml | 2 +- listings/ch03-optimisations/store_using_packing/Scarb.toml | 2 +- 24 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.github/workflows/verify-cairo-programs/action.yml b/.github/workflows/verify-cairo-programs/action.yml index 65eb0194..47cd87a7 100644 --- 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.7.0" + scarb-version: "2.3.0-rc1" - name: Run build script shell: bash diff --git a/.github/workflows/verify_cairo_programs.yml b/.github/workflows/verify_cairo_programs.yml index 4bbc1e67..8e05e480 100644 --- 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.7.0" + scarb-version: "2.3.0-rc1" - name: Run build script run: | diff --git a/.tool-versions b/.tool-versions index ce84f339..9e468f94 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -scarb 0.7.0 \ No newline at end of file +scarb 2.3.0-rc1 \ No newline at end of file diff --git a/Scarb.toml b/Scarb.toml index c4314770..415cbe68 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,5 +1,5 @@ [package] -name = "StarknetByExample" +name = "sbe" version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest diff --git a/listings/ch00-introduction/calling_other_contracts/Scarb.toml b/listings/ch00-introduction/calling_other_contracts/Scarb.toml index 28e2d6fc..4d9691a1 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] diff --git a/listings/ch00-introduction/constructor/Scarb.toml b/listings/ch00-introduction/constructor/Scarb.toml index 5b629c1f..006b90df 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/counter/Scarb.toml b/listings/ch00-introduction/counter/Scarb.toml index d2b87313..15f68b0e 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] diff --git a/listings/ch00-introduction/custom_type_serde/Scarb.toml b/listings/ch00-introduction/custom_type_serde/Scarb.toml index 2fa4c3ae..db066d0b 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/errors/Scarb.toml b/listings/ch00-introduction/errors/Scarb.toml index 5c4aad21..49f5d56a 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/errors/src/custom_errors.cairo b/listings/ch00-introduction/errors/src/custom_errors.cairo index 57718d6b..fa5a7b81 100644 --- a/listings/ch00-introduction/errors/src/custom_errors.cairo +++ b/listings/ch00-introduction/errors/src/custom_errors.cairo @@ -17,7 +17,6 @@ mod CustomErrorsExample { assert(i > 0, Errors::NOT_POSITIVE); } - #[view] fn test_panic(self: @ContractState, i: u256) { if (i == 0) { panic_with_felt252(Errors::NOT_NULL); diff --git a/listings/ch00-introduction/events/Scarb.toml b/listings/ch00-introduction/events/Scarb.toml index 306c7db3..daa7427c 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/interfaces_traits/Scarb.toml b/listings/ch00-introduction/interfaces_traits/Scarb.toml index 57539e43..a6038152 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] diff --git a/listings/ch00-introduction/mappings/Scarb.toml b/listings/ch00-introduction/mappings/Scarb.toml index c01f0dcc..5780e8a0 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] diff --git a/listings/ch00-introduction/storing_custom_types/Scarb.toml b/listings/ch00-introduction/storing_custom_types/Scarb.toml index 23a170f0..5ec279e4 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/testing/Scarb.toml b/listings/ch00-introduction/testing/Scarb.toml index 0bc3ad3a..f91b4cd6 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] diff --git a/listings/ch00-introduction/variables/Scarb.toml b/listings/ch00-introduction/variables/Scarb.toml index 335a9b36..01fae6c4 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch00-introduction/visibility/Scarb.toml b/listings/ch00-introduction/visibility/Scarb.toml index bc812624..b32d8540 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch01-advanced-concepts/storing_arrays/Scarb.toml b/listings/ch01-advanced-concepts/storing_arrays/Scarb.toml index 7742ba7e..aaff4243 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo b/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo index e85efc72..6a0e7909 100644 --- a/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo +++ b/listings/ch01-advanced-concepts/storing_arrays/src/storing_arrays.cairo @@ -56,9 +56,7 @@ impl StoreFelt252Array of Store> { Store::::write_at_offset(address_domain, base, offset, element); offset += Store::::size(); }, - Option::None(_) => { - break Result::Ok(()); - } + Option::None(_) => { break Result::Ok(()); } }; } } diff --git a/listings/ch01-advanced-concepts/struct_as_mapping_key/Scarb.toml b/listings/ch01-advanced-concepts/struct_as_mapping_key/Scarb.toml index 10d3a247..1c6bbe1d 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch01-advanced-concepts/write_to_any_slot/Scarb.toml b/listings/ch01-advanced-concepts/write_to_any_slot/Scarb.toml index a032393d..b75b9497 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch02-applications/simple_vault/Scarb.toml b/listings/ch02-applications/simple_vault/Scarb.toml index 6261faf8..6cf2566a 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch02-applications/upgradeable_contract/Scarb.toml b/listings/ch02-applications/upgradeable_contract/Scarb.toml index f5abd3b4..e22c36ee 100644 --- 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.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file diff --git a/listings/ch03-optimisations/store_using_packing/Scarb.toml b/listings/ch03-optimisations/store_using_packing/Scarb.toml index c3801a07..23d7758a 100644 --- a/listings/ch03-optimisations/store_using_packing/Scarb.toml +++ b/listings/ch03-optimisations/store_using_packing/Scarb.toml @@ -3,6 +3,6 @@ name = "store_using_packing" version = "0.1.0" [dependencies] -starknet = ">=2.2.0" +starknet = ">=2.3.0-rc0" [[target.starknet-contract]] \ No newline at end of file