Skip to content
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.

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

Upgrade contract to Cairo 2.7 #549

Merged
merged 14 commits into from
Aug 21, 2024
Prev Previous commit
Next Next commit
cairo 2.7 compiles with warnings and tests pass
piniom committed Aug 21, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 760a920a02299a60d30abd51bc2f553007a80f96
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
scarb 2.6.5
scarb 2.7.0
starknet-foundry 0.18.0
nodejs v20.11.1
17 changes: 9 additions & 8 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -6,11 +6,12 @@ edition = "2023_10"
version = "0.1.0"

[workspace.dependencies]
starknet = "2.6.3"
alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "cairo-v2.6.0" }
alexandria_encoding = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "cairo-v2.6.0" }
alexandria_merkle_tree = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.6.0" }
alexandria_data_structures = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.6.0" }
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.20.0" }
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.12.0" }
argent = { git = "https://github.com/cartridge-gg/argent-contracts-starknet.git", branch = "main" }
starknet = "2.7.0"
alexandria_math = { git = "https://github.com/gaetbout/quaireaux.git", rev = "846621a" }
alexandria_encoding = { git = "https://github.com/gaetbout/quaireaux.git", rev = "846621a" }
alexandria_merkle_tree = { git = "https://github.com/gaetbout/quaireaux.git", rev = "846621a" }
alexandria_data_structures = { git = "https://github.com/gaetbout/quaireaux.git", tag = "846621a" }
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.27.0" }
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", rev = "a13bae3" }
# argent = { git = "https://github.com/cartridge-gg/argent-contracts-starknet.git", branch = "main" }
argent = {path = "../argent-contracts-starknet"}
3 changes: 2 additions & 1 deletion packages/account_sdk/parser_config.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@
"controller::introspection::src5::src5_component::Event": "Src5ComponentEvent",
"openzeppelin::token::erc20::erc20::ERC20Component::Event": "ERC20ComponentEvent",
"openzeppelin::access::ownable::ownable::OwnableComponent::Event": "OwnableComponentEvent",
"openzeppelin_upgrades::upgradeable::UpgradeableComponent::Event": "UpgradeEvent",
"openzeppelin::upgrades::upgradeable::UpgradeableComponent::Event": "UpgradeEvent",
"openzeppelin::security::reentrancyguard::ReentrancyGuardComponent::Event": "ReentrancyGuardEvent"
"openzeppelin_security::reentrancyguard::ReentrancyGuardComponent::Event": "ReentrancyGuardEvent"
}
}
7 changes: 4 additions & 3 deletions packages/contracts/controller/src/account.cairo
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@ trait ICartridgeAccount<TContractState> {

#[starknet::contract(account)]
mod CartridgeAccount {
use core::traits::TryInto;
use openzeppelin::upgrades::UpgradeableComponent::InternalTrait;
use core::traits::TryInto;
use core::option::OptionTrait;
use core::array::SpanTrait;
use core::to_byte_array::FormatAsByteArray;
@@ -78,7 +79,7 @@ mod CartridgeAccount {
use controller::delegate_account::delegate_account::delegate_account_component;
use controller::introspection::src5::src5_component;
use controller::session::{
session::session_component::{InternalImpl, InternalTrait}, session::session_component,
session::session_component::InternalImpl, session::session_component,
interface::ISessionCallback
};
use controller::multiple_owners::{
@@ -396,7 +397,7 @@ mod CartridgeAccount {
impl UpgradeableImpl of IUpgradeable<ContractState> {
fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {
self.assert_owner();
self.upgradeable._upgrade(new_class_hash);
self.upgradeable.upgrade(new_class_hash);
}
}