bump to Cairo 2.7.1 (edition 2024_07) + snfoundry 0.28.0

keep-starknet-strange · Aug 28, 2024 · 0feca81 · 0feca81
1 parent 4d74725
commit 0feca81
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 378 deletions.
diff --git a/onchain/Scarb.lock b/onchain/Scarb.lock
@@ -8,7 +8,15 @@ dependencies = [
  "snforge_std",
 ]
 
+[[package]]
+name = "snforge_scarb_plugin"
+version = "0.1.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.28.0#4dfe39d96690ed6b3d56971512700de3f58288ea"
+
 [[package]]
 name = "snforge_std"
-version = "0.25.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.25.0#5b366e24821e530fea97f11b211d220e8493fbea"
+version = "0.28.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.28.0#4dfe39d96690ed6b3d56971512700de3f58288ea"
+dependencies = [
+ "snforge_scarb_plugin",
+]
diff --git a/onchain/Scarb.toml b/onchain/Scarb.toml
@@ -1,15 +1,16 @@
 [package]
 name = "joyboy"
 version = "0.1.0"
-edition = "2023_11"
+edition = "2024_07"
 
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [dependencies]
-starknet = "2.6.3"
+starknet = "2.7.1"
+assert_macros = "0.1.0" 
 
 [dev-dependencies]
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.25.0" }
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.28.0" }
 
 #[lib]
 

diff --git a/onchain/src/bip340.cairo b/onchain/src/bip340.cairo
@@ -3,13 +3,12 @@
 use core::byte_array::ByteArrayTrait;
 use core::option::OptionTrait;
 use core::result::ResultTrait;
-// TODO: uncomment once Cairo 2.7 is available
-// use core::sha256::compute_sha256_byte_array;
+use core::sha256::compute_sha256_byte_array;
 use core::starknet::SyscallResultTrait;
 use core::to_byte_array::{AppendFormattedToByteArray, FormatAsByteArray};
 use core::traits::Into;
 
-use joyboy::utils::{shl, shr, compute_sha256_byte_array};
+use joyboy::utils::{shl, shr};
 use starknet::{secp256k1::{Secp256k1Point}, secp256_trait::{Secp256Trait, Secp256PointTrait}};
 
 const TWO_POW_32: u128 = 0x100000000;

diff --git a/onchain/src/erc20.cairo b/onchain/src/erc20.cairo
@@ -25,15 +25,19 @@ pub mod ERC20 {
     use starknet::ContractAddress;
     use starknet::contract_address_const;
     use starknet::get_caller_address;
+    use starknet::storage::{
+        StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess,
+        StoragePointerWriteAccess
+    };
 
     #[storage]
     struct Storage {
         name: felt252,
         symbol: felt252,
         decimals: u8,
         total_supply: u256,
-        balances: LegacyMap::<ContractAddress, u256>,
-        allowances: LegacyMap::<(ContractAddress, ContractAddress), u256>,
+        balances: starknet::storage::Map::<ContractAddress, u256>,
+        allowances: starknet::storage::Map::<(ContractAddress, ContractAddress), u256>,
     }
 
     #[event]

diff --git a/onchain/src/lib.cairo b/onchain/src/lib.cairo
@@ -1,5 +1,4 @@
 pub mod bip340;
 pub mod erc20;
-pub mod sha256;
 pub mod social;
 pub mod utils;
diff --git a/onchain/src/sha256.cairo b/onchain/src/sha256.cairo
diff --git a/onchain/src/social.cairo b/onchain/src/social.cairo
@@ -4,3 +4,4 @@ pub mod deposit;
 pub mod profile;
 pub mod request;
 pub mod transfer;
+pub mod utils;