Add outside excution account

contracts/.tool-versions

@@ -1 +1 @@
-scarb 2.8.2
+scarb 2.9.4

contracts/Scarb.lock

@@ -5,7 +5,9 @@ version = 1
 name = "katana_account"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_account",
+ "openzeppelin_introspection",
+ "openzeppelin_upgrades",
 ]
 
 [[package]]
@@ -15,108 +17,27 @@ version = "0.1.0"
 [[package]]
 name = "katana_misc"
 version = "0.1.0"
-dependencies = [
- "openzeppelin",
-]
-
-[[package]]
-name = "openzeppelin"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_finance",
- "openzeppelin_governance",
- "openzeppelin_introspection",
- "openzeppelin_merkle_tree",
- "openzeppelin_presets",
- "openzeppelin_security",
- "openzeppelin_token",
- "openzeppelin_upgrades",
- "openzeppelin_utils",
-]
-
-[[package]]
-name = "openzeppelin_access"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_introspection",
- "openzeppelin_utils",
-]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "1.0.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v1.0.0#755ce1adbf8d89ed23fbb8daa328fcbeab7c6424"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_finance"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_token",
-]
-
-[[package]]
-name = "openzeppelin_governance"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_introspection",
-]
-
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-
-[[package]]
-name = "openzeppelin_merkle_tree"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-
-[[package]]
-name = "openzeppelin_presets"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_finance",
- "openzeppelin_introspection",
- "openzeppelin_token",
- "openzeppelin_upgrades",
-]
-
-[[package]]
-name = "openzeppelin_security"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-
-[[package]]
-name = "openzeppelin_token"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_account",
- "openzeppelin_governance",
- "openzeppelin_introspection",
-]
+version = "1.0.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v1.0.0#755ce1adbf8d89ed23fbb8daa328fcbeab7c6424"
 
 [[package]]
 name = "openzeppelin_upgrades"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "1.0.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v1.0.0#755ce1adbf8d89ed23fbb8daa328fcbeab7c6424"
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "1.0.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v1.0.0#755ce1adbf8d89ed23fbb8daa328fcbeab7c6424"

contracts/Scarb.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = [ "account", "messaging/cairo", "misc"]
+members = ["account", "messaging/cairo", "misc"]
 
 [workspace.package]
 version = "0.1.0"
@@ -8,6 +8,8 @@ edition = "2023_11"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [workspace.dependencies]
-starknet = "2.8.2"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.17.0" }
+starknet = "2.9.4"
+openzeppelin_account = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v1.0.0" }
+openzeppelin_introspection = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v1.0.0" }
+openzeppelin_upgrades = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v1.0.0" }
 snforge_std = "0.30.0"

contracts/account/Scarb.toml

@@ -7,7 +7,9 @@ edition.workspace = true
 
 [dependencies]
 starknet.workspace = true
-openzeppelin.workspace = true
+openzeppelin_account.workspace = true
+openzeppelin_introspection.workspace = true
+openzeppelin_upgrades.workspace = true
 
 [[target.starknet-contract]]
 sierra = true

contracts/account/src/lib.cairo

@@ -8,22 +8,27 @@
 #[starknet::contract(account)]
 pub mod Account {
     use openzeppelin_account::AccountComponent;
+    use openzeppelin_account::extensions::SRC9Component;
     use openzeppelin_introspection::src5::SRC5Component;
     use openzeppelin_upgrades::UpgradeableComponent;
     use openzeppelin_upgrades::interface::IUpgradeable;
     use starknet::ClassHash;
 
     component!(path: AccountComponent, storage: account, event: AccountEvent);
     component!(path: SRC5Component, storage: src5, event: SRC5Event);
+    component!(path: SRC9Component, storage: src9, event: SRC9Event);
     component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);
 
     // Account Mixin
     #[abi(embed_v0)]
     pub(crate) impl AccountMixinImpl =
         AccountComponent::AccountMixinImpl<ContractState>;
-    impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;
+    #[abi(embed_v0)]
+    impl OutsideExecutionV2Impl =
+        SRC9Component::OutsideExecutionV2Impl<ContractState>;
 
-    // Upgradeable
+    impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;
+    impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;
     impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;
 
     #[storage]
@@ -33,7 +38,9 @@ pub mod Account {
         #[substorage(v0)]
         pub src5: SRC5Component::Storage,
         #[substorage(v0)]
-        pub upgradeable: UpgradeableComponent::Storage
+        src9: SRC9Component::Storage,
+        #[substorage(v0)]
+        pub upgradeable: UpgradeableComponent::Storage,
     }
 
     #[event]
@@ -44,12 +51,15 @@ pub mod Account {
         #[flat]
         SRC5Event: SRC5Component::Event,
         #[flat]
-        UpgradeableEvent: UpgradeableComponent::Event
+        SRC9Event: SRC9Component::Event,
+        #[flat]
+        UpgradeableEvent: UpgradeableComponent::Event,
     }
 
     #[constructor]
     pub fn constructor(ref self: ContractState, public_key: felt252) {
         self.account.initializer(public_key);
+        self.src9.initializer();
     }
 
     #[abi(embed_v0)]