Merge pull request #162 from horuslabsio/feat/upgrade-scarb-to-2.9.2

Darlington02 · web-flow · commit 05ca6b978f7b · 2025-01-25T15:26:41.000+01:00
Feat/upgrade scarb to 2.9.2
diff --git a/.github/workflows/build_contract.yml b/.github/workflows/build_contract.yml
@@ -12,7 +12,7 @@ jobs:
 
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.8.2"
+          scarb-version: "2.9.2"
 
       - name: Check cairo format
         run: cd contracts && scarb fmt --check
diff --git a/.github/workflows/test_contract.yml b/.github/workflows/test_contract.yml
@@ -11,11 +11,11 @@ jobs:
 
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.8.2"
+          scarb-version: "2.9.2"
 
       - uses: foundry-rs/setup-snfoundry@v3
         with:
-          starknet-foundry-version: 0.31.0
+          starknet-foundry-version: 0.36.0
 
       - name: Run cairo tests
         run: cd contracts && snforge test
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+scarb 2.9.2
+starknet-foundry 0.36.0
diff --git a/contracts/.DS_Store b/contracts/.DS_Store
diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -1,3 +1,4 @@
 target
 .snfoundry_cache/
-run
+run
+.DS_Store
diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -4,106 +4,67 @@ version = 1
 [[package]]
 name = "contracts"
 version = "0.1.0"
-dependencies = [
- "openzeppelin",
- "snforge_std",
-]
-
-[[package]]
-name = "openzeppelin"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
 dependencies = [
  "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_governance",
- "openzeppelin_introspection",
- "openzeppelin_presets",
- "openzeppelin_security",
  "openzeppelin_token",
- "openzeppelin_upgrades",
  "openzeppelin_utils",
+ "snforge_std",
 ]
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:7734901a0ca7a7065e69416fea615dd1dc586c8dc9e76c032f25ee62e8b2a06c"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:1aa3a71e2f40f66f98d96aa9bf9f361f53db0fd20fa83ef7df04426a3c3a926a"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_token",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_governance"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_introspection",
-]
-
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-
-[[package]]
-name = "openzeppelin_presets"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_introspection",
- "openzeppelin_token",
- "openzeppelin_upgrades",
-]
-
-[[package]]
-name = "openzeppelin_security"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:13e04a2190684e6804229a77a6c56de7d033db8b9ef519e5e8dee400a70d8a3d"
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:4452f449dc6c1ea97cf69d1d9182749abd40e85bd826cd79652c06a627eafd91"
 dependencies = [
+ "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_governance",
  "openzeppelin_introspection",
+ "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_upgrades"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-
 [[package]]
 name = "openzeppelin_utils"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74607"
 
 [[package]]
 name = "snforge_scarb_plugin"
-version = "0.31.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.31.0#72ea785ca354e9e506de3e5d687da9fb2c1b3c67"
+version = "0.36.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:b9550f5c921502be3e240e83aa9e2dc6ee63ae76bfecee082b7a15bead0460c0"
 
 [[package]]
 name = "snforge_std"
-version = "0.31.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.31.0#72ea785ca354e9e506de3e5d687da9fb2c1b3c67"
+version = "0.36.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:9f38c6c376447cfe225c5869905122f6a64bc301f5872c7855d2abe6e9c0a1da"
 dependencies = [
  "snforge_scarb_plugin",
 ]
diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -1,18 +1,25 @@
 [package]
 name = "contracts"
 version = "0.1.0"
+edition = "2023_11"
 
 [dependencies]
-starknet = "2.8.2"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.31.0" }
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.15.0" }
+starknet = "2.9.2"
+openzeppelin_access = "0.20.0"
+openzeppelin_token = "0.20.0"
+
+[dev-dependencies]
+openzeppelin_utils = "0.20.0"
+snforge_std = "0.36.0"
 
 [[target.starknet-contract]]
 casm = true
 sierra = true
 
 [tool.fmt]
-sort-module-level-items = false
+sort-module-level-items = true
 
-[tool.snforge]
-exit_first = false
+[[tool.snforge.fork]]
+name = "SEPOLIA_LATEST"
+url = "https://starknet-sepolia.public.blastapi.io/rpc/v0_7"
+block_id.tag = "latest"
diff --git a/contracts/scripts/Scarb.lock b/contracts/scripts/Scarb.lock
@@ -12,103 +12,56 @@ dependencies = [
 [[package]]
 name = "contracts"
 version = "0.1.0"
-dependencies = [
- "openzeppelin",
- "snforge_std",
-]
-
-[[package]]
-name = "openzeppelin"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
 dependencies = [
  "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_governance",
- "openzeppelin_introspection",
- "openzeppelin_presets",
- "openzeppelin_security",
  "openzeppelin_token",
- "openzeppelin_upgrades",
- "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:7734901a0ca7a7065e69416fea615dd1dc586c8dc9e76c032f25ee62e8b2a06c"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:1aa3a71e2f40f66f98d96aa9bf9f361f53db0fd20fa83ef7df04426a3c3a926a"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_token",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_governance"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_introspection",
-]
-
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-
-[[package]]
-name = "openzeppelin_presets"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_introspection",
- "openzeppelin_token",
- "openzeppelin_upgrades",
-]
-
-[[package]]
-name = "openzeppelin_security"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:13e04a2190684e6804229a77a6c56de7d033db8b9ef519e5e8dee400a70d8a3d"
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:4452f449dc6c1ea97cf69d1d9182749abd40e85bd826cd79652c06a627eafd91"
 dependencies = [
+ "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_governance",
  "openzeppelin_introspection",
+ "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_upgrades"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
-
 [[package]]
 name = "openzeppelin_utils"
-version = "0.15.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.0#f57642960f1c8cffafefb88bfff418eca8510634"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74607"
 
 [[package]]
 name = "sncast_std"
-version = "0.27.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.27.0#2d99b7c00678ef0363881ee0273550c44a9263de"
-
-[[package]]
-name = "snforge_std"
-version = "0.27.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.27.0#2d99b7c00678ef0363881ee0273550c44a9263de"
+version = "0.36.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:5012ac1b1dd4fe9c0b5c01c4f45f791edd5f217b5b3e54196d7d26848f802af1"
diff --git a/contracts/scripts/Scarb.toml b/contracts/scripts/Scarb.toml
@@ -6,8 +6,8 @@ edition = "2023_11"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [dependencies]
-sncast_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.31.0" }
-starknet = "2.8.2"
+sncast_std = "0.36.0"
+starknet = "2.9.2"
 contracts = { path = "../" }
 
 [lib]
diff --git a/contracts/scripts/hellostarknet_alpha-sepolia_state.json b/contracts/scripts/hellostarknet_alpha-sepolia_state.json
@@ -0,0 +1,4 @@
+{
+  "version": 1,
+  "transactions": null
+}
diff --git a/contracts/scripts/src/hellostarknet.cairo b/contracts/scripts/src/hellostarknet.cairo
@@ -1,7 +1,4 @@
-use sncast_std::{
-    declare, deploy, DeclareResult, DeployResult, get_nonce, DisplayContractAddress,
-    DisplayClassHash, FeeSettings, EthFeeSettings
-};
+use sncast_std::{DeclareResultTrait, EthFeeSettings, FeeSettings, declare, deploy, get_nonce};
 
 fn main() {
     let max_fee = 99999999999999999;
@@ -11,23 +8,23 @@ fn main() {
     let declare_result = declare(
         "HelloStarknet",
         FeeSettings::Eth(EthFeeSettings { max_fee: Option::Some(max_fee) }),
-        Option::Some(nonce)
+        Option::Some(nonce),
     )
         .expect('contract already declared');
 
-    let class_hash = declare_result.class_hash;
+    let class_hash = declare_result.class_hash();
 
-    println!("Class hash of the declared contract: {}", declare_result.class_hash);
+    println!("Class hash of the declared contract: {:?}", declare_result.class_hash());
 
     let deploy_result = deploy(
-        class_hash,
+        *class_hash,
         ArrayTrait::new(),
         Option::Some(salt),
         true,
         FeeSettings::Eth(EthFeeSettings { max_fee: Option::Some(max_fee) }),
-        Option::Some(nonce)
+        Option::Some(nonce),
     )
         .expect('deploy failed');
 
-    println!("Deployed the contract to address: {}", deploy_result.contract_address);
+    println!("Deployed the contract to address: {:?}", deploy_result.contract_address);
 }
diff --git a/contracts/tests/test_contract.cairo b/contracts/tests/test_contract.cairo
@@ -1,6 +1,5 @@
-use core::starknet::SyscallResultTrait;
-use snforge_std::{declare, ContractClassTrait, DeclareResultTrait, DeclareResult};
 use contracts::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait};
+use snforge_std::{ContractClassTrait, DeclareResult, declare};
 
 #[test]
 fn test_balance() {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+scarb 2.9.2`
	`2`	`+starknet-foundry 0.36.0`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 target
 .snfoundry_cache/
 -run
 +run
 +.DS_Store