fix(cairo): change scarb & cairo version to match latest katana version

ArkProjectNFTs · May 13, 2024 · 126fa6b · 126fa6b
1 parent 7fd65c6
commit 126fa6b
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 78 deletions.
diff --git a/contracts.json b/contracts.json
@@ -12,11 +12,5 @@
     "executor": "0x7b42945bc47001db92fe1b9739d753925263f2f1036c2ae1f87536c916ee6a",
     "orderbook": "0x5b0b2069b9567757fea9bfd4a2e588a151b8892ecb0e7bdcf0b7eeaefb86a60"
   },
-  "dev": {
-    "messaging": "0x2c8ae5699e492093e0f06225fb41050286fd40756603335e5c832f1ab90911c",
-    "executor": "0x22419164936022963b861d4ecaf20c72207183d9a86fd8bbe4e6a584da3a768",
-    "nftContract": "0x1903a865f4472b09b13dbf3d24f42271d2803b90f2029c807d6c4400b5042",
-    "eth": "0x7b8fc5c78bf249bb4173ef45267da1a710c65d76bb9ff03deb6b8fc21f35ba4",
-    "orderbook": "0x2426ebb057f812c38e9870cd68c8f1f0cfea48c34b1017258e4e66c208ae14"
-  }
+  "dev": {}
 }
diff --git a/contracts/.tool-versions b/contracts/.tool-versions
@@ -1,2 +1,2 @@
-scarb 2.6.4
-starknet-foundry 0.22.0
+scarb 2.5.4
+starknet-foundry 0.18.0
diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -35,13 +35,13 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin"
-version = "0.12.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.12.0#0697004db74502ce49900edef37331dd03531356"
+version = "0.10.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.10.0#d77082732daab2690ba50742ea41080eb23299d3"
 
 [[package]]
 name = "snforge_std"
-version = "0.22.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.22.0#9b215944c6c5871c738381b4ded61bbf06e7ba35"
+version = "0.18.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.18.0#48f909a56b08cbdc5ca6a21a836b0fbc6c36d55b"
 
 [[package]]
 name = "solis"

diff --git a/contracts/ark_common/.tool-versions b/contracts/ark_common/.tool-versions
diff --git a/contracts/ark_common/Scarb.toml b/contracts/ark_common/Scarb.toml
@@ -5,8 +5,8 @@ version = "0.1.0"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [dependencies]
-starknet = "2.6.3"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.22.0" }
+starknet = "2.5.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
 
 [lib]
 

diff --git a/contracts/ark_orderbook/.tool-versions b/contracts/ark_orderbook/.tool-versions
diff --git a/contracts/ark_orderbook/Scarb.toml b/contracts/ark_orderbook/Scarb.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 
 [dependencies]
 ark_common = { path = "../ark_common" }
-starknet = "2.6.3"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.22.0" }
+starknet = "2.5.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
 
 [[target.starknet-contract]]
 sierra = true

diff --git a/contracts/ark_starknet/.tool-versions b/contracts/ark_starknet/.tool-versions
diff --git a/contracts/ark_starknet/Scarb.toml b/contracts/ark_starknet/Scarb.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 
 [dependencies]
 ark_common = { path = "../ark_common" }
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.12.0" }
-starknet = "2.6.3"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.22.0" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.10.0" }
+starknet = "2.5.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
 
 [[target.starknet-contract]]
 sierra = true

diff --git a/contracts/ark_tokens/.tool-versions b/contracts/ark_tokens/.tool-versions
diff --git a/contracts/ark_tokens/Scarb.toml b/contracts/ark_tokens/Scarb.toml
@@ -4,9 +4,9 @@ description = "StarkNet contracts for test tokens"
 version = "0.1.0"
 
 [dependencies]
-starknet = "2.6.3"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.22.0" }
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.12.0" }
+starknet = "2.5.4"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.18.0" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.10.0" }
 
 [lib]
 

diff --git a/contracts/ark_tokens/src/erc20.cairo b/contracts/ark_tokens/src/erc20.cairo
@@ -7,7 +7,7 @@ trait IFreeMint<T> {
 
 #[starknet::contract]
 mod FreeMintERC20 {
-    use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};
+    use openzeppelin::token::erc20::ERC20Component;
     use starknet::ContractAddress;
     use super::IFreeMint;
 

diff --git a/contracts/solis/.tool-versions b/contracts/solis/.tool-versions
diff --git a/contracts/solis/Scarb.toml b/contracts/solis/Scarb.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [dependencies]
-starknet = "2.6.3"
+starknet = "2.5.4"
 
 [[target.starknet-contract]]
 sierra = true

diff --git a/crates/solis/messaging.local.json b/crates/solis/messaging.local.json
@@ -1,9 +1,9 @@
 {
   "chain": "starknet",
   "rpc_url": "http://0.0.0.0:5050",
-  "contract_address": "0x2c8ae5699e492093e0f06225fb41050286fd40756603335e5c832f1ab90911c",
+  "contract_address": "0x5776e8ba9acd1b67985b005a4fa9d2b03216e0d2df18d8131f2c42330090b37",
   "sender_address": "0x2d71e9c974539bb3ffb4b115e66a23d0f62a641ea66c4016e903454c8753bbc",
   "private_key": "0x33003003001800009900180300d206308b0070db00121318d17b5e6262150b",
   "interval": 2,
   "from_block": 0
-}
+}
diff --git a/packages/core/src/contracts.ts b/packages/core/src/contracts.ts
@@ -1,28 +1,16 @@
 // This file is auto-generated. Do not edit directly.
 
 export const GOERLI_CONTRACTS = {
-  nftContract:
-    "0x22411b480425fe6e627fdf4d1b6ac7f8567314ada5617a0a6d8ef3e74b69436",
-  messaging:
-    "0x2c3d3e0c37d29364a13ba8cff046e7bc5624655a72526961876a1c8bb3f63c8",
-  executor: "0x73148536f8ea9546e92761d11515548cc433df46883d5ee98871a6f63a0bbbc",
-  orderbook: "0x66f1e6acf9bdbd23837b2eea271430298b355c506978edb132737e7fcb6b310"
+  "nftContract": "0x22411b480425fe6e627fdf4d1b6ac7f8567314ada5617a0a6d8ef3e74b69436",
+  "messaging": "0x2c3d3e0c37d29364a13ba8cff046e7bc5624655a72526961876a1c8bb3f63c8",
+  "executor": "0x73148536f8ea9546e92761d11515548cc433df46883d5ee98871a6f63a0bbbc",
+  "orderbook": "0x66f1e6acf9bdbd23837b2eea271430298b355c506978edb132737e7fcb6b310"
 };
 export const SEPOLIA_CONTRACTS = {};
 export const MAINNET_CONTRACTS = {
-  nftContract:
-    "0x32d99485b22f2e58c8a0206d3b3bb259997ff0db70cffd25585d7dd9a5b0546",
-  messaging:
-    "0x57d45cc46de463f7ae63b74ce9b6b6b496a1178b02e7ad04d7c307caa698b7b",
-  executor: "0x7b42945bc47001db92fe1b9739d753925263f2f1036c2ae1f87536c916ee6a",
-  orderbook: "0x5b0b2069b9567757fea9bfd4a2e588a151b8892ecb0e7bdcf0b7eeaefb86a60"
-};
-export const DEV_CONTRACTS = {
-  messaging:
-    "0x2c8ae5699e492093e0f06225fb41050286fd40756603335e5c832f1ab90911c",
-  executor: "0x22419164936022963b861d4ecaf20c72207183d9a86fd8bbe4e6a584da3a768",
-  nftContract:
-    "0x1903a865f4472b09b13dbf3d24f42271d2803b90f2029c807d6c4400b5042",
-  eth: "0x7b8fc5c78bf249bb4173ef45267da1a710c65d76bb9ff03deb6b8fc21f35ba4",
-  orderbook: "0x2426ebb057f812c38e9870cd68c8f1f0cfea48c34b1017258e4e66c208ae14"
+  "nftContract": "0x32d99485b22f2e58c8a0206d3b3bb259997ff0db70cffd25585d7dd9a5b0546",
+  "messaging": "0x57d45cc46de463f7ae63b74ce9b6b6b496a1178b02e7ad04d7c307caa698b7b",
+  "executor": "0x7b42945bc47001db92fe1b9739d753925263f2f1036c2ae1f87536c916ee6a",
+  "orderbook": "0x5b0b2069b9567757fea9bfd4a2e588a151b8892ecb0e7bdcf0b7eeaefb86a60"
 };
+export const DEV_CONTRACTS = {};
diff --git a/packages/deployer-solis/package.json b/packages/deployer-solis/package.json
@@ -27,7 +27,7 @@
     "dotenv": "^16.3.1",
     "loading-cli": "^1.1.2",
     "node-fetch": "^3.3.2",
-    "starknet": "5.27.0"
+    "starknet": "5.24.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.7",

diff --git a/packages/deployer/src/deployStarknetFreemintNft.ts b/packages/deployer/src/deployStarknetFreemintNft.ts
@@ -33,7 +33,9 @@ export async function deployStarknetContracts(
   const contractCallData = new CallData(artifacts.sierra.abi);
   const contractConstructor = contractCallData.compile("constructor", {
     name: "ARKTEST",
-    symbol: "ARKTEST"
+    symbol: "ARKTEST",
+    base_uri:
+      "https://ipfs.io/ipfs/QmVXJ2eEx3xrD2mSdPqLBEEYM5obj6DRYkn5yant6rXPmw/"
   });
 
   const deployR = await starknetAdminAccount.declareAndDeploy({

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml