chore: update to cairo v2.3.0-rc0

NethermindEth · Oct 10, 2023 · 105ee33 · 105ee33
1 parent d9a3cac
commit 105ee33
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 26 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.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
@@ -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
@@ -1 +1 @@
-scarb 0.7.0
+scarb 2.3.0-rc1
diff --git 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
@@ -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
@@ -3,6 +3,6 @@ name = "constructor"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[target.starknet-contract]]
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.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
@@ -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]]
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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[target.starknet-contract]]
diff --git 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
@@ -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/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
@@ -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
@@ -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]]
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.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
@@ -3,6 +3,6 @@ name = "variables"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[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
@@ -56,9 +56,7 @@ impl StoreFelt252Array of Store<Array<felt252>> {
  Store::<felt252>::write_at_offset(address_domain, base, offset, element);
  offset += Store::<felt252>::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
@@ -3,6 +3,6 @@ name = "src"
 version = "0.1.0"
 
 [dependencies]
-starknet = ">=2.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[target.starknet-contract]]
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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[target.starknet-contract]]
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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[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.2.0"
+starknet = ">=2.3.0-rc0"
 
 [[target.starknet-contract]]
diff --git 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]]