Skip to content

Update scarb, starknet and l2 contract to latest version #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ugo-X merged 4 commits into from
Aug 20, 2025
Merged

Update scarb, starknet and l2 contract to latest version #111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ff5124
Update scarb, starknet and l2 contract to latest version
GideonBature Aug 19, 2025
56cc79f
chore: cleanups
JoE11-y Aug 20, 2025
452a1a0
chore: updates
JoE11-y Aug 20, 2025
cf0ccef
chore: add formats
JoE11-y Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contracts/L2/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ target
.snfoundry_cache/
.tool-versions
node_modules
.env
.env
Scarb.lock
4 changes: 2 additions & 2 deletions contracts/L2/.tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
scarb 2.9.2
starknet-foundry 0.36.0
scarb 2.12.0
starknet-foundry 0.48.1
10 changes: 5 additions & 5 deletions contracts/L2/Scarb.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = 1
[[package]]
name = "cairo_lib"
version = "0.2.0"
source = "git+https://github.com/HerodotusDev/cairo-lib.git#a0c0ee4feeb4edb61e7a35d29595ad8647c3d469"
source = "git+https://github.com/Explore-Beyond-Innovations/cairo-lib.git?rev=afc30b93404f6f5c595f97d1f4f795983872600a#afc30b93404f6f5c595f97d1f4f795983872600a"

[[package]]
name = "integrity"
Expand Down Expand Up @@ -77,15 +77,15 @@ checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74

[[package]]
name = "snforge_scarb_plugin"
version = "0.36.0"
version = "0.48.1"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:b9550f5c921502be3e240e83aa9e2dc6ee63ae76bfecee082b7a15bead0460c0"
checksum = "sha256:2dd27e8215eea8785b3930e9f452e11b429ca262b1c1fbb071bfc173b9ebc125"

[[package]]
name = "snforge_std"
version = "0.36.0"
version = "0.48.1"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:9f38c6c376447cfe225c5869905122f6a64bc301f5872c7855d2abe6e9c0a1da"
checksum = "sha256:89f759fa685d48ed0ba7152d2ac2eb168da08dfa8b84b2bee96e203dc5b2413e"
dependencies = [
"snforge_scarb_plugin",
]
6 changes: 3 additions & 3 deletions contracts/L2/Scarb.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ edition = "2024_07"

[dependencies]
integrity = "2.0.0"
starknet = "2.9.2"
starknet = "2.12.0"
openzeppelin_access = "0.20.0"
openzeppelin_introspection = "0.20.0"
openzeppelin_token = "0.20.0"
openzeppelin_upgrades = "0.20.0"
cairo_lib = { git = "https://github.com/Explore-Beyond-Innovations/cairo-lib.git", rev = "afc30b93404f6f5c595f97d1f4f795983872600a" }

[dev-dependencies]
assert_macros = "2.9.2"
assert_macros = "2.12.0"
openzeppelin_utils = "0.20.0"
snforge_std = "0.36.0"
snforge_std = "0.48.0"

[[target.starknet-contract]]
sierra = true
Expand Down
2 changes: 1 addition & 1 deletion contracts/L2/src/core/ZeroXBridgeL2.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ pub mod ZeroXBridgeL2 {
storage_ptr.write(*peaks.at(i));
};
for i in last_peaks_len..peaks_len {
self.last_peaks.append().write(*peaks.at(i));
self.last_peaks.push(*peaks.at(i));
};
}

Expand Down
6 changes: 3 additions & 3 deletions contracts/L2/src/dao/DAO.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use core::starknet::ContractAddress;
use starknet::storage::Map;
use starknet::{ContractAddress, storage::Map};

// Define the ExecutiveAction interface
#[starknet::interface]
Expand Down Expand Up @@ -111,12 +110,13 @@ pub mod DAO {
use starknet::event::EventEmitter;
use starknet::storage::StorageMapWriteAccess;
use starknet::storage::StorageMapReadAccess;
#[feature("deprecated-starknet-consts")]
use starknet::{ContractAddress, contract_address_const};
use starknet::get_caller_address;
use starknet::get_block_timestamp;
use core::traits::Into;
use core::array::ArrayTrait;
use core::starknet::storage::{
use starknet::storage::{
StoragePointerReadAccess, StoragePointerWriteAccess, Map, StoragePathEntry,
};
use super::{Proposal, ProposalStatus, ProposalBindingData, BindingVote, BindingVoteTrait};
Expand Down
2 changes: 1 addition & 1 deletion contracts/L2/src/dao/Timelock.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ mod Timelock {
while i < calldata_length {
// If indexing returns a pointer (@u256), use .read() to obtain the value.
let element: u256 = *calldata.at(i);
action_entry.calldata.append().write(element);
action_entry.calldata.push(element);
i = i + 1;
};

Expand Down
2 changes: 1 addition & 1 deletion contracts/L2/src/mocks/MockMerkleManager.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub mod MockMerkleManager {
storage_ptr.write(*peaks.at(i));
};
for i in prev_peaks_len..peaks_len {
self.last_peaks.append().write(*peaks.at(i));
self.last_peaks.push(*peaks.at(i));
};
}

Expand Down