From 1f85ac6e4f9769e07a8d76c51a135fb1e2a893f0 Mon Sep 17 00:00:00 2001
From: Eric Nordelo <eric.nordelo39@gmail.com>
Date: Mon, 16 Dec 2024 12:44:56 +0100
Subject: [PATCH 1/5] feat: add controls and logic

---
 packages/core-cairo/src/account.ts           | 33 +++++++++++++++++++-
 packages/core-cairo/src/generate/account.ts  |  1 +
 packages/ui/src/cairo/AccountControls.svelte |  8 +++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/packages/core-cairo/src/account.ts b/packages/core-cairo/src/account.ts
index bfbeaca2..91c0a0dd 100644
--- a/packages/core-cairo/src/account.ts
+++ b/packages/core-cairo/src/account.ts
@@ -17,6 +17,7 @@ export const defaults: Required<AccountOptions> = {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: false,
   upgradeable: commonDefaults.upgradeable,
   info: commonDefaults.info
 } as const;
@@ -31,6 +32,7 @@ export interface AccountOptions extends CommonOptions {
   declare?: boolean;
   deploy?: boolean;
   pubkey?: boolean;
+  outsideExecution?: boolean;
 }
 
 function withDefaults(opts: AccountOptions): Required<AccountOptions> {
@@ -39,7 +41,8 @@ function withDefaults(opts: AccountOptions): Required<AccountOptions> {
     ...withCommonDefaults(opts),
     declare: opts.declare ?? defaults.declare,
     deploy: opts.deploy ?? defaults.deploy,
-    pubkey: opts.pubkey ?? defaults.pubkey
+    pubkey: opts.pubkey ?? defaults.pubkey,
+    outsideExecution: opts.outsideExecution ?? defaults.outsideExecution
   }
 }
 
@@ -79,6 +82,10 @@ export function buildAccount(opts: AccountOptions): Contract {
     }
   }
 
+  if (allOpts.outsideExecution) {
+    addOutsideExecution(c);
+  }
+
   setAccountUpgradeable(c, allOpts.upgradeable, allOpts.type);
   setInfo(c, allOpts.info);
 
@@ -131,6 +138,11 @@ function addPublicKey(c: ContractBuilder, accountType: Account) {
   });
 }
 
+function addOutsideExecution(c: ContractBuilder) {
+  c.addUseClause('openzeppelin::account::extensions', 'SRC9Component');
+  c.addComponent(components.SRC9Component, [], true);
+}
+
 function addAccountMixin(c: ContractBuilder, accountType: Account) {
   const accountMixinImpl = accountType === 'stark' ? 'AccountMixinImpl' : 'EthAccountMixinImpl';
   const [baseComponent, componentType] = getBaseCompAndCompType(accountType);
@@ -182,4 +194,23 @@ const components = defineComponents( {
       value: 'EthAccountComponent::InternalImpl<ContractState>',
     }]
   },
+  SRC9Component: {
+    path: 'openzeppelin::account::extensions',
+    substorage: {
+      name: 'src9',
+      type: 'SRC9Component::Storage',
+    },
+    event: {
+      name: 'SRC9Event',
+      type: 'SRC9Component::Event',
+    },
+    impls: [{
+      name: 'OutsideExecutionV2Impl',
+      value: 'SRC9Component::OutsideExecutionV2Impl<ContractState>',
+    }, {
+      name: 'OutsideExecutionInternalImpl',
+      embed: false,
+      value: 'SRC9Component::InternalImpl<ContractState>',
+    }]
+  }
 });
diff --git a/packages/core-cairo/src/generate/account.ts b/packages/core-cairo/src/generate/account.ts
index aeca5c76..175ba8df 100644
--- a/packages/core-cairo/src/generate/account.ts
+++ b/packages/core-cairo/src/generate/account.ts
@@ -11,6 +11,7 @@ const blueprint = {
   declare: booleans,
   deploy: booleans,
   pubkey: booleans,
+  outsideExecution: booleans,
   upgradeable: upgradeableOptions,
   info: infoOptions,
 };
diff --git a/packages/ui/src/cairo/AccountControls.svelte b/packages/ui/src/cairo/AccountControls.svelte
index faf3d829..c5aaa7db 100644
--- a/packages/ui/src/cairo/AccountControls.svelte
+++ b/packages/ui/src/cairo/AccountControls.svelte
@@ -51,6 +51,14 @@
   <h1>Features</h1>
 
   <div class="checkbox-group">
+    <label class:checked={opts.outsideExecution}>
+      <input type="checkbox" bind:checked={opts.outsideExecution}>
+      Outside Execution
+      <HelpTooltip link="https://github.com/starknet-io/SNIPs/blob/main/SNIPS/snip-9.md">
+        Allows a protocol to submit transactions on behalf of the account, as long as it has the relevant signatures.
+      </HelpTooltip>
+    </label>
+
     <label class:checked={opts.declare}>
       <input type="checkbox" bind:checked={opts.declare}>
       Declarer

From 58861ca7ec3863a9fe8c0f15f499688e7ad65c55 Mon Sep 17 00:00:00 2001
From: Eric Nordelo <eric.nordelo39@gmail.com>
Date: Mon, 16 Dec 2024 12:50:48 +0100
Subject: [PATCH 2/5] feat: update tests

---
 packages/core-cairo/src/account.test.ts       |  47 +++++++---
 packages/core-cairo/src/account.test.ts.md    |  80 ++++++++++++++++++
 packages/core-cairo/src/account.test.ts.snap  | Bin 1783 -> 1934 bytes
 packages/core-cairo/src/account.ts            |   2 +-
 .../src/scripts/update-scarb-project.ts       |   2 +-
 5 files changed, 117 insertions(+), 14 deletions(-)

diff --git a/packages/core-cairo/src/account.test.ts b/packages/core-cairo/src/account.test.ts
index e6771d00..98cd92f8 100644
--- a/packages/core-cairo/src/account.test.ts
+++ b/packages/core-cairo/src/account.test.ts
@@ -38,6 +38,7 @@ function testAPIEquivalence(title: string, opts?: AccountOptions) {
       declare: true,
       deploy: true,
       pubkey: true,
+      outsideExecution: true,
       ...opts,
     })));
   });
@@ -55,6 +56,7 @@ testAccount('explicit full account, mixin + upgradeable', {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: true,
   upgradeable: true
 });
 
@@ -64,47 +66,56 @@ testAccount('explicit full account, mixin + non-upgradeable', {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: true,
   upgradeable: false
 });
 
 testAccount('basic account, upgradeable', {
   declare: false,
   deploy: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testAccount('basic account, non-upgradeable', {
   declare: false,
   deploy: false,
   pubkey: false,
+  outsideExecution: false,
   upgradeable: false
 });
 
 testAccount('account declarer', {
   deploy: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testAccount('account deployable', {
   declare: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testAccount('account public key', {
   declare: false,
   deploy: false,
+  outsideExecution: false,
 });
 
 testAccount('account declarer, deployable', {
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testAccount('account declarer, public key', {
-  deploy: false
+  deploy: false,
+  outsideExecution: false,
 });
 
 testAccount('account deployable, public key', {
-  declare: false
+  declare: false,
+  outsideExecution: false,
 });
 
 testEthAccount('default full ethAccount, mixin + upgradeable', {});
@@ -119,6 +130,7 @@ testEthAccount('explicit full ethAccount, mixin + upgradeable', {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: true,
   upgradeable: true
 });
 
@@ -128,47 +140,56 @@ testEthAccount('explicit full ethAccount, mixin + non-upgradeable', {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: true,
   upgradeable: false
 });
 
 testEthAccount('basic ethAccount, upgradeable', {
   declare: false,
   deploy: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testEthAccount('basic ethAccount, non-upgradeable', {
   declare: false,
   deploy: false,
   pubkey: false,
+  outsideExecution: false,
   upgradeable: false
 });
 
 testEthAccount('ethAccount declarer', {
   deploy: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testEthAccount('ethAccount deployable', {
   declare: false,
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testEthAccount('ethAccount public key', {
   declare: false,
   deploy: false,
+  outsideExecution: false,
 });
 
 testEthAccount('ethAccount declarer, deployable', {
-  pubkey: false
+  pubkey: false,
+  outsideExecution: false,
 });
 
 testEthAccount('ethAccount declarer, public key', {
-  deploy: false
+  deploy: false,
+  outsideExecution: false,
 });
 
 testEthAccount('ethAccount deployable, public key', {
-  declare: false
+  declare: false,
+  outsideExecution: false,
 });
 
 testAPIEquivalence('account API default');
@@ -179,6 +200,7 @@ testAPIEquivalence('account API basic', {
   declare: false,
   deploy: false,
   pubkey: false,
+  outsideExecution: false,
   upgradeable: false,
 });
 
@@ -188,6 +210,7 @@ testAPIEquivalence('account API full upgradeable', {
   declare: true,
   deploy: true,
   pubkey: true,
+  outsideExecution: true,
   upgradeable: true,
 });
 
diff --git a/packages/core-cairo/src/account.test.ts.md b/packages/core-cairo/src/account.test.ts.md
index 3896b7e2..c4e4eb50 100644
--- a/packages/core-cairo/src/account.test.ts.md
+++ b/packages/core-cairo/src/account.test.ts.md
@@ -14,6 +14,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::AccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
@@ -21,14 +22,18 @@ Generated by [AVA](https://avajs.dev).
     ␊
         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);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl AccountMixinImpl = AccountComponent::AccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
         impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
@@ -38,6 +43,8 @@ Generated by [AVA](https://avajs.dev).
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
             #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
             upgradeable: UpgradeableComponent::Storage,␊
         }␊
     ␊
@@ -49,12 +56,15 @@ Generated by [AVA](https://avajs.dev).
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
             #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
             UpgradeableEvent: UpgradeableComponent::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: felt252) {␊
             self.account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     ␊
         //␊
@@ -81,17 +91,22 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::AccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
     ␊
         component!(path: AccountComponent, storage: account, event: AccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl AccountMixinImpl = AccountComponent::AccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
         struct Storage {␊
@@ -99,6 +114,8 @@ Generated by [AVA](https://avajs.dev).
             account: AccountComponent::Storage,␊
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
         }␊
     ␊
         #[event]␊
@@ -108,11 +125,14 @@ Generated by [AVA](https://avajs.dev).
             AccountEvent: AccountComponent::Event,␊
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: felt252) {␊
             self.account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     }␊
     `
@@ -127,6 +147,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::AccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
@@ -134,14 +155,18 @@ Generated by [AVA](https://avajs.dev).
     ␊
         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);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl AccountMixinImpl = AccountComponent::AccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
         impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
@@ -151,6 +176,8 @@ Generated by [AVA](https://avajs.dev).
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
             #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
             upgradeable: UpgradeableComponent::Storage,␊
         }␊
     ␊
@@ -162,12 +189,15 @@ Generated by [AVA](https://avajs.dev).
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
             #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
             UpgradeableEvent: UpgradeableComponent::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: felt252) {␊
             self.account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     ␊
         //␊
@@ -194,17 +224,22 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::AccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
     ␊
         component!(path: AccountComponent, storage: account, event: AccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl AccountMixinImpl = AccountComponent::AccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
         struct Storage {␊
@@ -212,6 +247,8 @@ Generated by [AVA](https://avajs.dev).
             account: AccountComponent::Storage,␊
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
         }␊
     ␊
         #[event]␊
@@ -221,11 +258,14 @@ Generated by [AVA](https://avajs.dev).
             AccountEvent: AccountComponent::Event,␊
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: felt252) {␊
             self.account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     }␊
     `
@@ -811,6 +851,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::eth_account::EthAccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::account::interface::EthPublicKey;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
@@ -819,14 +860,18 @@ Generated by [AVA](https://avajs.dev).
     ␊
         component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
         component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl EthAccountMixinImpl = EthAccountComponent::EthAccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl EthAccountInternalImpl = EthAccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
         impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
@@ -836,6 +881,8 @@ Generated by [AVA](https://avajs.dev).
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
             #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
             upgradeable: UpgradeableComponent::Storage,␊
         }␊
     ␊
@@ -847,12 +894,15 @@ Generated by [AVA](https://avajs.dev).
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
             #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
             UpgradeableEvent: UpgradeableComponent::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: EthPublicKey) {␊
             self.eth_account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     ␊
         //␊
@@ -879,18 +929,23 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::eth_account::EthAccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::account::interface::EthPublicKey;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
     ␊
         component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl EthAccountMixinImpl = EthAccountComponent::EthAccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl EthAccountInternalImpl = EthAccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
         struct Storage {␊
@@ -898,6 +953,8 @@ Generated by [AVA](https://avajs.dev).
             eth_account: EthAccountComponent::Storage,␊
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
         }␊
     ␊
         #[event]␊
@@ -907,11 +964,14 @@ Generated by [AVA](https://avajs.dev).
             EthAccountEvent: EthAccountComponent::Event,␊
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: EthPublicKey) {␊
             self.eth_account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     }␊
     `
@@ -926,6 +986,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::eth_account::EthAccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::account::interface::EthPublicKey;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
@@ -934,14 +995,18 @@ Generated by [AVA](https://avajs.dev).
     ␊
         component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
         component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl EthAccountMixinImpl = EthAccountComponent::EthAccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl EthAccountInternalImpl = EthAccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
         impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
@@ -951,6 +1016,8 @@ Generated by [AVA](https://avajs.dev).
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
             #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
             upgradeable: UpgradeableComponent::Storage,␊
         }␊
     ␊
@@ -962,12 +1029,15 @@ Generated by [AVA](https://avajs.dev).
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
             #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
             UpgradeableEvent: UpgradeableComponent::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: EthPublicKey) {␊
             self.eth_account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     ␊
         //␊
@@ -994,18 +1064,23 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract(account)]␊
     mod MyAccount {␊
         use openzeppelin::account::eth_account::EthAccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
         use openzeppelin::account::interface::EthPublicKey;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
     ␊
         component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊
         component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
     ␊
         // External␊
         #[abi(embed_v0)]␊
         impl EthAccountMixinImpl = EthAccountComponent::EthAccountMixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
     ␊
         // Internal␊
         impl EthAccountInternalImpl = EthAccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
     ␊
         #[storage]␊
         struct Storage {␊
@@ -1013,6 +1088,8 @@ Generated by [AVA](https://avajs.dev).
             eth_account: EthAccountComponent::Storage,␊
             #[substorage(v0)]␊
             src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
         }␊
     ␊
         #[event]␊
@@ -1022,11 +1099,14 @@ Generated by [AVA](https://avajs.dev).
             EthAccountEvent: EthAccountComponent::Event,␊
             #[flat]␊
             SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
         }␊
     ␊
         #[constructor]␊
         fn constructor(ref self: ContractState, public_key: EthPublicKey) {␊
             self.eth_account.initializer(public_key);␊
+            self.src9.initializer();␊
         }␊
     }␊
     `
diff --git a/packages/core-cairo/src/account.test.ts.snap b/packages/core-cairo/src/account.test.ts.snap
index a013fa64f04464e7787db06f8f16d27c94eee0c3..844aba58471e81dfb550780f99be15db738330a4 100644
GIT binary patch
literal 1934
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
U82AtTH%I>aA8!P#2cXUX004)mQUCw|

literal 1783
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
Z|AGJX1P1;C|ILv9{s&sHVxq{u001J9SwsK;

diff --git a/packages/core-cairo/src/account.ts b/packages/core-cairo/src/account.ts
index 91c0a0dd..68914729 100644
--- a/packages/core-cairo/src/account.ts
+++ b/packages/core-cairo/src/account.ts
@@ -17,7 +17,7 @@ export const defaults: Required<AccountOptions> = {
   declare: true,
   deploy: true,
   pubkey: true,
-  outsideExecution: false,
+  outsideExecution: true,
   upgradeable: commonDefaults.upgradeable,
   info: commonDefaults.info
 } as const;
diff --git a/packages/core-cairo/src/scripts/update-scarb-project.ts b/packages/core-cairo/src/scripts/update-scarb-project.ts
index 022e7475..2946c96d 100644
--- a/packages/core-cairo/src/scripts/update-scarb-project.ts
+++ b/packages/core-cairo/src/scripts/update-scarb-project.ts
@@ -9,7 +9,7 @@ export async function updateScarbProject() {
   await fs.rm(generatedSourcesPath, { force: true, recursive: true });
 
   // Generate the contracts source code
-  const contractNames = await writeGeneratedSources(generatedSourcesPath, 'all', true);
+  const contractNames = await writeGeneratedSources(generatedSourcesPath, 'all', true, 'Account');
 
   // Generate lib.cairo file
   writeLibCairo(contractNames);

From b951a0340dd94ee47cb10af2406b3bc2dc804a98 Mon Sep 17 00:00:00 2001
From: Eric Nordelo <eric.nordelo39@gmail.com>
Date: Mon, 16 Dec 2024 12:51:18 +0100
Subject: [PATCH 3/5] refactor: update scarb project script

---
 packages/core-cairo/src/scripts/update-scarb-project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-cairo/src/scripts/update-scarb-project.ts b/packages/core-cairo/src/scripts/update-scarb-project.ts
index 2946c96d..022e7475 100644
--- a/packages/core-cairo/src/scripts/update-scarb-project.ts
+++ b/packages/core-cairo/src/scripts/update-scarb-project.ts
@@ -9,7 +9,7 @@ export async function updateScarbProject() {
   await fs.rm(generatedSourcesPath, { force: true, recursive: true });
 
   // Generate the contracts source code
-  const contractNames = await writeGeneratedSources(generatedSourcesPath, 'all', true, 'Account');
+  const contractNames = await writeGeneratedSources(generatedSourcesPath, 'all', true);
 
   // Generate lib.cairo file
   writeLibCairo(contractNames);

From 6640c91b3bb0b554f8595636a658a27d069ccfef Mon Sep 17 00:00:00 2001
From: Eric Nordelo <eric.nordelo39@gmail.com>
Date: Tue, 17 Dec 2024 11:53:25 +0100
Subject: [PATCH 4/5] feat: add CHANGELOG entry, bump version, and add test

---
 packages/core-cairo/CHANGELOG.md             |   6 +-
 packages/core-cairo/package.json             |   2 +-
 packages/core-cairo/src/account.test.ts      |  12 ++
 packages/core-cairo/src/account.test.ts.md   | 163 +++++++++++++++++++
 packages/core-cairo/src/account.test.ts.snap | Bin 1934 -> 2044 bytes
 5 files changed, 181 insertions(+), 2 deletions(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index 5690a838..8553198c 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.20.1 (2024-12-17)
+
+- Add OutsideExecution to accounts. ([#422](https://github.com/OpenZeppelin/contracts-wizard/pull/422))
+
 ## 0.20.0 (2024-12-10)
 
 - Add Governor tab. ([#417](https://github.com/OpenZeppelin/contracts-wizard/pull/417))
@@ -9,7 +13,7 @@
 
 ## 0.19.0 (2024-11-27)
 
-- Add ERC2981 (RoyaltyInfo) for ERC721 and ERC1155 ([#413](https://github.com/OpenZeppelin/contracts-wizard/pull/413))
+- Add ERC2981 (RoyaltyInfo) for ERC721 and ERC1155. ([#413](https://github.com/OpenZeppelin/contracts-wizard/pull/413))
 
 ## 0.18.0 (2024-11-15)
 
diff --git a/packages/core-cairo/package.json b/packages/core-cairo/package.json
index ad0e12cb..42aa1939 100644
--- a/packages/core-cairo/package.json
+++ b/packages/core-cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",
diff --git a/packages/core-cairo/src/account.test.ts b/packages/core-cairo/src/account.test.ts
index 98cd92f8..217e1d81 100644
--- a/packages/core-cairo/src/account.test.ts
+++ b/packages/core-cairo/src/account.test.ts
@@ -85,6 +85,12 @@ testAccount('basic account, non-upgradeable', {
   upgradeable: false
 });
 
+testAccount('account outside execution', {
+  deploy: false,
+  pubkey: false,
+  declare: false,
+});
+
 testAccount('account declarer', {
   deploy: false,
   pubkey: false,
@@ -159,6 +165,12 @@ testEthAccount('basic ethAccount, non-upgradeable', {
   upgradeable: false
 });
 
+testEthAccount('ethAccount outside execution', {
+  deploy: false,
+  pubkey: false,
+  declare: false,
+});
+
 testEthAccount('ethAccount declarer', {
   deploy: false,
   pubkey: false,
diff --git a/packages/core-cairo/src/account.test.ts.md b/packages/core-cairo/src/account.test.ts.md
index c4e4eb50..a62ea81f 100644
--- a/packages/core-cairo/src/account.test.ts.md
+++ b/packages/core-cairo/src/account.test.ts.md
@@ -391,6 +391,87 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
+## account outside execution
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.20.0␊
+    ␊
+    #[starknet::contract(account)]␊
+    mod MyAccount {␊
+        use openzeppelin::account::AccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
+        use openzeppelin::introspection::src5::SRC5Component;␊
+        use openzeppelin::upgrades::interface::IUpgradeable;␊
+        use openzeppelin::upgrades::UpgradeableComponent;␊
+        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);␊
+    ␊
+        // External␊
+        #[abi(embed_v0)]␊
+        impl SRC6Impl = AccountComponent::SRC6Impl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl SRC6CamelOnlyImpl = AccountComponent::SRC6CamelOnlyImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
+    ␊
+        // Internal␊
+        impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
+        impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
+    ␊
+        #[storage]␊
+        struct Storage {␊
+            #[substorage(v0)]␊
+            account: AccountComponent::Storage,␊
+            #[substorage(v0)]␊
+            src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
+            upgradeable: UpgradeableComponent::Storage,␊
+        }␊
+    ␊
+        #[event]␊
+        #[derive(Drop, starknet::Event)]␊
+        enum Event {␊
+            #[flat]␊
+            AccountEvent: AccountComponent::Event,␊
+            #[flat]␊
+            SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
+            UpgradeableEvent: UpgradeableComponent::Event,␊
+        }␊
+    ␊
+        #[constructor]␊
+        fn constructor(ref self: ContractState, public_key: felt252) {␊
+            self.account.initializer(public_key);␊
+            self.src9.initializer();␊
+        }␊
+    ␊
+        //␊
+        // Upgradeable␊
+        //␊
+        ␊
+        #[abi(embed_v0)]␊
+        impl UpgradeableImpl of IUpgradeable<ContractState> {␊
+            fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
+                self.account.assert_only_self();␊
+                self.upgradeable.upgrade(new_class_hash);␊
+            }␊
+        }␊
+    }␊
+    `
+
 ## account declarer
 
 > Snapshot 1
@@ -1234,6 +1315,88 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
+## ethAccount outside execution
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.20.0␊
+    ␊
+    #[starknet::contract(account)]␊
+    mod MyAccount {␊
+        use openzeppelin::account::eth_account::EthAccountComponent;␊
+        use openzeppelin::account::extensions::SRC9Component;␊
+        use openzeppelin::account::interface::EthPublicKey;␊
+        use openzeppelin::introspection::src5::SRC5Component;␊
+        use openzeppelin::upgrades::interface::IUpgradeable;␊
+        use openzeppelin::upgrades::UpgradeableComponent;␊
+        use starknet::ClassHash;␊
+    ␊
+        component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊
+        component!(path: SRC5Component, storage: src5, event: SRC5Event);␊
+        component!(path: SRC9Component, storage: src9, event: SRC9Event);␊
+        component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);␊
+    ␊
+        // External␊
+        #[abi(embed_v0)]␊
+        impl SRC6Impl = EthAccountComponent::SRC6Impl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl SRC6CamelOnlyImpl = EthAccountComponent::SRC6CamelOnlyImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OutsideExecutionV2Impl = SRC9Component::OutsideExecutionV2Impl<ContractState>;␊
+    ␊
+        // Internal␊
+        impl EthAccountInternalImpl = EthAccountComponent::InternalImpl<ContractState>;␊
+        impl OutsideExecutionInternalImpl = SRC9Component::InternalImpl<ContractState>;␊
+        impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
+    ␊
+        #[storage]␊
+        struct Storage {␊
+            #[substorage(v0)]␊
+            eth_account: EthAccountComponent::Storage,␊
+            #[substorage(v0)]␊
+            src5: SRC5Component::Storage,␊
+            #[substorage(v0)]␊
+            src9: SRC9Component::Storage,␊
+            #[substorage(v0)]␊
+            upgradeable: UpgradeableComponent::Storage,␊
+        }␊
+    ␊
+        #[event]␊
+        #[derive(Drop, starknet::Event)]␊
+        enum Event {␊
+            #[flat]␊
+            EthAccountEvent: EthAccountComponent::Event,␊
+            #[flat]␊
+            SRC5Event: SRC5Component::Event,␊
+            #[flat]␊
+            SRC9Event: SRC9Component::Event,␊
+            #[flat]␊
+            UpgradeableEvent: UpgradeableComponent::Event,␊
+        }␊
+    ␊
+        #[constructor]␊
+        fn constructor(ref self: ContractState, public_key: EthPublicKey) {␊
+            self.eth_account.initializer(public_key);␊
+            self.src9.initializer();␊
+        }␊
+    ␊
+        //␊
+        // Upgradeable␊
+        //␊
+        ␊
+        #[abi(embed_v0)]␊
+        impl UpgradeableImpl of IUpgradeable<ContractState> {␊
+            fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
+                self.eth_account.assert_only_self();␊
+                self.upgradeable.upgrade(new_class_hash);␊
+            }␊
+        }␊
+    }␊
+    `
+
 ## ethAccount declarer
 
 > Snapshot 1
diff --git a/packages/core-cairo/src/account.test.ts.snap b/packages/core-cairo/src/account.test.ts.snap
index 844aba58471e81dfb550780f99be15db738330a4..f3ee3b899daa0da7fe98fd892b812c854666bec5 100644
GIT binary patch
literal 2044
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
a5BvxIQxh2Y5B#@4{`()c{?d4J;{X7F6Vk%~

literal 1934
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
U82AtTH%I>aA8!P#2cXUX004)mQUCw|


From d1e829c365fbad22f2205dc486613aa13df6376b Mon Sep 17 00:00:00 2001
From: Eric Nordelo <eric.nordelo39@gmail.com>
Date: Tue, 17 Dec 2024 16:46:04 +0100
Subject: [PATCH 5/5] Update packages/core-cairo/package.json

Co-authored-by: Eric Lau <ericglau@outlook.com>
---
 packages/core-cairo/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-cairo/package.json b/packages/core-cairo/package.json
index 42aa1939..decaeb1d 100644
--- a/packages/core-cairo/package.json
+++ b/packages/core-cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "0.21.0",
+  "version": "0.20.1",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",