@openzeppelin/miden-multisig-client 0.13.4 → 0.14.3

package/masm/auth/multisig_ecdsa.masm

@@ -3,26 +3,23 @@
 # This library provides the reusable multisig procedures used by account wrappers.
 
 use miden::protocol::active_account
+use miden::protocol::auth::AUTH_UNAUTHORIZED_EVENT
 use miden::protocol::native_account
 use miden::standards::auth
-type BeWord = struct @bigendian { a: felt, b: felt, c: felt, d: felt }
 
 # CONSTANTS
 # =================================================================================================
 
 # Auth Request Constants
 
-# The event emitted when a signature is not found for a required signer.
-const AUTH_UNAUTHORIZED_EVENT=event("miden::auth::unauthorized")
-
 # Storage Layout Constants
 #
-# +-------------------------------+----------+--------------+-------------------+
-# | THRESHOLD & APPROVERS CONFIG  | PUB KEYS | EXECUTED TXS |  PROC THRESHOLDS  |
-# |           (slot)              |   (map)  |    (map)     |       (map)       |
-# +-------------------------------+----------+--------------+-------------------+
-# |              0                |    1     |      2       |         3         |
-# +-------------------------------+----------+--------------+-------------------+
+# +-------------------------------+----------+------------+--------------+-------------------+
+# | THRESHOLD & APPROVERS CONFIG  | PUB KEYS | SCHEME IDS | EXECUTED TXS |  PROC THRESHOLDS  |
+# |           (slot)              |   (map)  |   (map)    |    (map)     |       (map)       |
+# +-------------------------------+----------+------------+--------------+-------------------+
+# |              0                |    1     |      2     |      3       |         4         |
+# +-------------------------------+----------+------------+--------------+-------------------+
 
 # The slot in this component's storage layout where the default signature threshold and
 # number of approvers are stored as:
@@ -34,6 +31,10 @@ const THRESHOLD_CONFIG_SLOT=word("openzeppelin::multisig::threshold_config")
 # Map entries: [key_index, 0, 0, 0] => APPROVER_PUBLIC_KEY
 const PUBLIC_KEYS_MAP_SLOT=word("openzeppelin::multisig::signer_public_keys")
 
+# The slot in this component's storage layout where signer scheme IDs are stored.
+# Map entries: [key_index, 0, 0, 0] => [scheme_id, 0, 0, 0]
+const APPROVER_SCHEME_ID_SLOT=word("openzeppelin::multisig::signer_scheme_ids")
+
 # The slot in this component's storage layout where executed transactions are stored.
 # Map entries: transaction_message => [is_executed, 0, 0, 0]
 const EXECUTED_TXS_SLOT=word("openzeppelin::multisig::executed_transactions")
@@ -44,6 +45,7 @@ const PROC_THRESHOLD_ROOTS_SLOT=word("openzeppelin::multisig::procedure_threshol
 
 # Executed Transaction Flag Constant
 const IS_EXECUTED_FLAG=[1, 0, 0, 0]
+const ECDSA_K256_KECCAK_SCHEME_WORD=[1, 0, 0, 0]
 
 # ERRORS
 const ERR_TX_ALREADY_EXECUTED="failed to approve multisig transaction as it was already executed"
@@ -68,7 +70,7 @@ const ERR_PROC_THRESHOLD_EXCEEDS_NUM_APPROVERS="procedure threshold exceeds numb
 #!
 #! Panics if:
 #! - the same transaction has already been executed
-pub proc assert_new_tx(msg: BeWord)
+pub proc assert_new_tx(msg: word)
     push.IS_EXECUTED_FLAG
     # => [[0, 0, 0, is_executed], MSG]
 
@@ -112,17 +114,29 @@ proc cleanup_pubkey_mapping(init_num_of_approvers: u32, new_num_of_approvers: u3
         sub.1
         # => [i-1, new_num_of_approvers]
 
-        dup
-        # => [i-1, i-1, new_num_of_approvers]
-
-        push.0.0.0
-        # => [[0, 0, 0, i-1], i-1, new_num_of_approvers]
+        dup exec.create_approver_map_key
+        # => [APPROVER_MAP_KEY, i-1, new_num_of_approvers]
 
         padw swapw
-        # => [[0, 0, 0, i-1], EMPTY_WORD, i-1, new_num_of_approvers]
+        # => [APPROVER_MAP_KEY, EMPTY_WORD, i-1, new_num_of_approvers]
 
         push.PUBLIC_KEYS_MAP_SLOT[0..2]
-        # => [pub_key_slot_prefix, pub_key_slot_suffix, [0, 0, 0, i-1], EMPTY_WORD, i-1, new_num_of_approvers]
+        # => [pub_key_slot_prefix, pub_key_slot_suffix, APPROVER_MAP_KEY, EMPTY_WORD, i-1, new_num_of_approvers]
+
+        exec.native_account::set_map_item
+        # => [OLD_MAP_VALUE, i-1, new_num_of_approvers]
+
+        dropw
+        # => [i-1, new_num_of_approvers]
+
+        dup exec.create_approver_map_key
+        # => [APPROVER_MAP_KEY, i-1, new_num_of_approvers]
+
+        padw swapw
+        # => [APPROVER_MAP_KEY, EMPTY_WORD, i-1, new_num_of_approvers]
+
+        push.APPROVER_SCHEME_ID_SLOT[0..2]
+        # => [scheme_slot_prefix, scheme_slot_suffix, APPROVER_MAP_KEY, EMPTY_WORD, i-1, new_num_of_approvers]
 
         exec.native_account::set_map_item
         # => [OLD_MAP_VALUE, i-1, new_num_of_approvers]
@@ -139,15 +153,17 @@ proc cleanup_pubkey_mapping(init_num_of_approvers: u32, new_num_of_approvers: u3
     # => []
 end
 
+proc create_approver_map_key
+    push.0.0.0 movup.3
+    # => [APPROVER_MAP_KEY]
+end
+
 proc get_threshold_and_num_approvers
     push.THRESHOLD_CONFIG_SLOT[0..2]
     exec.active_account::get_initial_item
-    # => [0, 0, num_approvers, threshold]
-
-    drop drop
-    # => [num_approvers, threshold]
+    # => [threshold, num_approvers]
 
-    swap
+    movup.2 drop movup.2 drop
     # => [threshold, num_approvers]
 end
 
@@ -167,10 +183,10 @@ proc assert_proc_thresholds_lte_num_approvers(num_approvers: u32)
         push.PROC_THRESHOLD_ROOTS_SLOT[0..2]
         # => [proc_roots_slot_prefix, proc_roots_slot_suffix, PROC_ROOT, proc_index, num_approvers]
 
-        exec.active_account::get_initial_map_item
-        # => [[0, 0, 0, proc_threshold], proc_index, num_approvers]
+        exec.active_account::get_map_item
+        # => [[proc_threshold, 0, 0, 0], proc_index, num_approvers]
 
-        drop drop drop
+        movdn.3 drop drop drop
         # => [proc_threshold, proc_index, num_approvers]
 
         dup.2
@@ -190,7 +206,7 @@ end
 
 # Internal storage helper used by the public `update_procedure_threshold`
 # entrypoint after it receives direct stack arguments.
-proc set_procedure_threshold(proc_threshold: u32, proc_root: BeWord)
+proc set_procedure_threshold(proc_threshold: u32, proc_root: word)
     exec.get_threshold_and_num_approvers
     # => [threshold, num_approvers, proc_threshold, PROC_ROOT]
 
@@ -205,6 +221,7 @@ proc set_procedure_threshold(proc_threshold: u32, proc_root: BeWord)
     # => [proc_threshold, PROC_ROOT]
 
     push.0.0.0
+    movup.3
     swapw
     # => [PROC_ROOT, PROC_THRESHOLD_WORD]
 
@@ -237,7 +254,7 @@ end
 #! 0: new_num_of_approvers
 #! 1: init_num_of_approvers
 @locals(2)
-pub proc update_signers_and_threshold(multisig_config_hash: BeWord)
+pub proc update_signers_and_threshold(multisig_config_hash: word)
     adv.push_mapval
     # => [MULTISIG_CONFIG_HASH, pad(12)]
 
@@ -245,10 +262,10 @@ pub proc update_signers_and_threshold(multisig_config_hash: BeWord)
     # => [MULTISIG_CONFIG, pad(12)]
 
     # store new_num_of_approvers for later
-    dup.2 loc_store.0
+    dup.1 loc_store.0
     # => [MULTISIG_CONFIG, pad(12)]
 
-    dup.3 dup.3
+    dup dup.2
     # => [num_approvers, threshold, MULTISIG_CONFIG, pad(12)]
 
     # make sure that the threshold is smaller than the number of approvers
@@ -256,7 +273,7 @@ pub proc update_signers_and_threshold(multisig_config_hash: BeWord)
     u32gt assertz.err=ERR_MALFORMED_MULTISIG_CONFIG
     # => [MULTISIG_CONFIG, pad(12)]
 
-    dup.3 dup.3
+    dup dup.2
     # => [num_approvers, threshold, MULTISIG_CONFIG, pad(12)]
 
     # make sure that threshold or num_approvers are not zero
@@ -277,7 +294,7 @@ pub proc update_signers_and_threshold(multisig_config_hash: BeWord)
     # => [OLD_THRESHOLD_CONFIG, pad(12)]
 
     # store init_num_of_approvers for later
-    drop drop loc_store.1 drop
+    drop loc_store.1 drop drop
     # => [pad(12)]
 
     loc_load.0
@@ -288,17 +305,35 @@ pub proc update_signers_and_threshold(multisig_config_hash: BeWord)
         sub.1
         # => [i-1, pad(12)]
 
-        dup push.0.0.0
-        # => [[0, 0, 0, i-1], i-1, pad(12)]
+        dup exec.create_approver_map_key
+        # => [APPROVER_MAP_KEY, i-1, pad(12)]
 
         padw adv_loadw
-        # => [PUB_KEY, [0, 0, 0, i-1], i-1, pad(12)]
+        # => [PUB_KEY, APPROVER_MAP_KEY, i-1, pad(12)]
 
         swapw
-        # => [[0, 0, 0, i-1], PUB_KEY, i-1, pad(12)]
+        # => [APPROVER_MAP_KEY, PUB_KEY, i-1, pad(12)]
 
         push.PUBLIC_KEYS_MAP_SLOT[0..2]
-        # => [pub_key_slot_prefix, pub_key_slot_suffix, [0, 0, 0, i-1], PUB_KEY, i-1, pad(12)]
+        # => [pub_key_slot_prefix, pub_key_slot_suffix, APPROVER_MAP_KEY, PUB_KEY, i-1, pad(12)]
+
+        exec.native_account::set_map_item
+        # => [OLD_VALUE, i-1, pad(12)]
+
+        dropw
+        # => [i-1, pad(12)]
+
+        dup exec.create_approver_map_key
+        # => [APPROVER_MAP_KEY, i-1, pad(12)]
+
+        push.ECDSA_K256_KECCAK_SCHEME_WORD
+        # => [SCHEME_ID_WORD, APPROVER_MAP_KEY, i-1, pad(12)]
+
+        swapw
+        # => [APPROVER_MAP_KEY, [1, 0, 0, 0], i-1, pad(12)]
+
+        push.APPROVER_SCHEME_ID_SLOT[0..2]
+        # => [scheme_slot_prefix, scheme_slot_suffix, APPROVER_MAP_KEY, [1, 0, 0, 0], i-1, pad(12)]
 
         exec.native_account::set_map_item
         # => [OLD_VALUE, i-1, pad(12)]
@@ -331,7 +366,7 @@ end
 #! Outputs:
 #!   Operand stack: []
 #! Invocation: call
-pub proc update_procedure_threshold(proc_threshold: u32, proc_root: BeWord)
+pub proc update_procedure_threshold(proc_threshold: u32, proc_root: word)
     exec.set_procedure_threshold
 end
 
@@ -387,9 +422,9 @@ proc compute_transaction_threshold(default_threshold: u32) -> u32
             # 2b. get the override proc_threshold of that procedure
             # if the procedure has no override threshold, the returned map item will be [0, 0, 0, 0]
             exec.active_account::get_initial_map_item
-            # => [[0, 0, 0, proc_threshold], num_procedures-1, transaction_threshold]
+            # => [[proc_threshold, 0, 0, 0], num_procedures-1, transaction_threshold]
 
-            drop drop drop dup dup.3
+            movdn.3 drop drop drop dup dup.3
             # => [transaction_threshold, proc_threshold, proc_threshold, num_procedures-1, transaction_threshold]
 
             u32assert2.err="transaction threshold or procedure threshold are not u32"
@@ -458,18 +493,18 @@ end
 #!
 #! Invocation: exec
 @locals(1)
-pub proc auth_tx(salt: BeWord) -> BeWord
+pub proc auth_tx(salt: word)
     exec.native_account::incr_nonce drop
     # => [SALT]
 
     # ------ Computing transaction summary ------
 
     exec.auth::create_tx_summary
-    # => [SALT, OUTPUT_NOTES_COMMITMENT, INPUT_NOTES_COMMITMENT, ACCOUNT_DELTA_COMMITMENT]
+    # => [ACCOUNT_DELTA_COMMITMENT, INPUT_NOTES_COMMITMENT, OUTPUT_NOTES_COMMITMENT, SALT]
 
     # to build a tx_summary in the host, we need these four words in the advice provider
-    exec.auth::adv_insert_hqword
-    # => [SALT, OUTPUT_NOTES_COMMITMENT, INPUT_NOTES_COMMITMENT, ACCOUNT_DELTA_COMMITMENT]
+    adv.insert_hqword
+    # => [ACCOUNT_DELTA_COMMITMENT, INPUT_NOTES_COMMITMENT, OUTPUT_NOTES_COMMITMENT, SALT]
 
     # the commitment to the tx summary is the message that is signed
     exec.auth::hash_tx_summary
@@ -477,22 +512,19 @@ pub proc auth_tx(salt: BeWord) -> BeWord
 
     # ------ Verifying approver signatures ------
 
-    push.THRESHOLD_CONFIG_SLOT[0..2]
-    # => [config_slot_prefix, config_slot_suffix, TX_SUMMARY_COMMITMENT]
-
-    exec.active_account::get_initial_item
-    # => [0, 0, num_of_approvers, default_threshold, TX_SUMMARY_COMMITMENT]
-
-    drop drop
-    # => [num_of_approvers, default_threshold, TX_SUMMARY_COMMITMENT]
+    exec.get_threshold_and_num_approvers
+    # => [default_threshold, num_of_approvers, TX_SUMMARY_COMMITMENT]
 
-    swap movdn.5
+    movdn.5
     # => [num_of_approvers, TX_SUMMARY_COMMITMENT, default_threshold]
 
     push.PUBLIC_KEYS_MAP_SLOT[0..2]
     # => [pub_key_slot_prefix, pub_key_slot_suffix, num_of_approvers, TX_SUMMARY_COMMITMENT, default_threshold]
 
-    exec.::miden::standards::auth::ecdsa_k256_keccak::verify_signatures
+    push.APPROVER_SCHEME_ID_SLOT[0..2]
+    # => [scheme_id_slot_prefix, scheme_id_slot_suffix, pub_key_slot_prefix, pub_key_slot_suffix, num_of_approvers, TX_SUMMARY_COMMITMENT, default_threshold]
+
+    exec.::miden::standards::auth::signature::verify_signatures
     # => [num_verified_signatures, TX_SUMMARY_COMMITMENT, default_threshold]
 
     # ------ Checking threshold is >= num_verified_signatures ------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/miden-multisig-client",
-  "version": "0.13.4",
+  "version": "0.14.3",
   "description": "TypeScript SDK for Miden multisig accounts with GUARDIAN integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@noble/curves": "^1.9.7",
-    "@miden-sdk/miden-sdk": "0.13.0",
+    "@miden-sdk/miden-sdk": "0.14.3",
     "@noble/hashes": "^2.0.1",
-    "@openzeppelin/guardian-client": "^0.13.4"
+    "@openzeppelin/guardian-client": "^0.14.3"
   },
   "devDependencies": {
     "typescript": "^5.7.2",

package/src/account/builder.test.ts

@@ -98,13 +98,14 @@ describe('createMultisigAccount', () => {
 
   it('uses Falcon MASM by default', async () => {
     const authBuilder = {
-      buildLibrary: vi.fn((libraryPath, source) => ({ libraryPath, source })),
-      linkStaticLibrary: vi.fn(),
-      compileAccountComponentCode: vi.fn((source) => `auth:${source.slice(0, 16)}`),
+      linkModule: vi.fn(),
+      compileAccountComponentCode: vi.fn((source) => ({ source })),
     };
     const webClient = {
       createCodeBuilder: vi.fn().mockReturnValue(authBuilder),
-      newAccount: vi.fn(),
+      accounts: {
+        insert: vi.fn().mockResolvedValue(undefined),
+      },
     };
 
     await createMultisigAccount(webClient as never, {
@@ -113,12 +114,12 @@ describe('createMultisigAccount', () => {
       guardianCommitment: '0x' + '2'.repeat(64),
     });
 
-    expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(
+    expect(authBuilder.linkModule).toHaveBeenNthCalledWith(
       1,
       'openzeppelin::auth::guardian',
       GUARDIAN_MASM,
     );
-    expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(
+    expect(authBuilder.linkModule).toHaveBeenNthCalledWith(
       2,
       'openzeppelin::auth::multisig',
       MULTISIG_MASM,
@@ -126,18 +127,19 @@ describe('createMultisigAccount', () => {
     expect(authBuilder.compileAccountComponentCode).toHaveBeenCalledWith(
       MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM,
     );
-    expect(webClient.newAccount).toHaveBeenCalledTimes(1);
+    expect(webClient.accounts.insert).toHaveBeenCalledTimes(1);
   });
 
   it('uses ECDSA MASM when requested', async () => {
     const authBuilder = {
-      buildLibrary: vi.fn((libraryPath, source) => ({ libraryPath, source })),
-      linkStaticLibrary: vi.fn(),
-      compileAccountComponentCode: vi.fn((source) => `auth:${source.slice(0, 16)}`),
+      linkModule: vi.fn(),
+      compileAccountComponentCode: vi.fn((source) => ({ source })),
     };
     const webClient = {
       createCodeBuilder: vi.fn().mockReturnValue(authBuilder),
-      newAccount: vi.fn(),
+      accounts: {
+        insert: vi.fn().mockResolvedValue(undefined),
+      },
     };
 
     await createMultisigAccount(webClient as never, {
@@ -147,12 +149,12 @@ describe('createMultisigAccount', () => {
       signatureScheme: 'ecdsa',
     });
 
-    expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(
+    expect(authBuilder.linkModule).toHaveBeenNthCalledWith(
       1,
       'openzeppelin::auth::guardian_ecdsa',
       GUARDIAN_ECDSA_MASM,
     );
-    expect(authBuilder.buildLibrary).toHaveBeenNthCalledWith(
+    expect(authBuilder.linkModule).toHaveBeenNthCalledWith(
       2,
       'openzeppelin::auth::multisig_ecdsa',
       MULTISIG_ECDSA_MASM,
@@ -160,6 +162,6 @@ describe('createMultisigAccount', () => {
     expect(authBuilder.compileAccountComponentCode).toHaveBeenCalledWith(
       MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM,
     );
-    expect(webClient.newAccount).toHaveBeenCalledTimes(1);
+    expect(webClient.accounts.insert).toHaveBeenCalledTimes(1);
   });
 });

package/src/account/builder.ts

@@ -9,9 +9,10 @@ import {
   AccountComponent,
   AccountType,
   AccountStorageMode,
-  type WebClient,
+  type MidenClient,
 } from '@miden-sdk/miden-sdk';
 import type { MultisigConfig, CreateAccountResult } from '../types.js';
+import { getRawMidenClient } from '../raw-client.js';
 import { buildMultisigStorageSlots, buildGuardianStorageSlots } from './storage.js';
 import {
   MULTISIG_ECDSA_MASM,
@@ -28,16 +29,18 @@ import { normalizeSignerCommitment } from '../utils/signature.js';
 /**
  * Creates a multisig account with GUARDIAN authentication.
  *
- * @param webClient - Initialized Miden WebClient
+ * @param midenClient - Initialized MidenClient
  * @param config - Multisig configuration
  * @returns The created account and seed
  */
 export async function createMultisigAccount(
-  webClient: WebClient,
-  config: MultisigConfig
+  midenClient: MidenClient,
+  config: MultisigConfig,
+  midenRpcEndpoint?: string,
 ): Promise<CreateAccountResult> {
   validateMultisigConfig(config);
   const signatureScheme = config.signatureScheme ?? 'falcon';
+  const rawClient = await getRawMidenClient(midenClient, midenRpcEndpoint);
   const authSlots = [
     ...buildMultisigStorageSlots(config),
     ...buildGuardianStorageSlots(config),
@@ -54,14 +57,12 @@ export async function createMultisigAccount(
     ? 'openzeppelin::auth::multisig_ecdsa'
     : 'openzeppelin::auth::multisig';
 
-  const authBuilder = webClient.createCodeBuilder();
-  const guardianLib = authBuilder.buildLibrary(guardianLibraryPath, guardianMasm);
-  authBuilder.linkStaticLibrary(guardianLib);
-  const multisigLib = authBuilder.buildLibrary(multisigLibraryPath, multisigMasm);
-  authBuilder.linkStaticLibrary(multisigLib);
-  const authCode = authBuilder.compileAccountComponentCode(authComponentMasm);
+  const authBuilder = rawClient.createCodeBuilder();
+  authBuilder.linkModule(guardianLibraryPath, guardianMasm);
+  authBuilder.linkModule(multisigLibraryPath, multisigMasm);
+  const authComponentCode = authBuilder.compileAccountComponentCode(authComponentMasm);
   const authComponent = AccountComponent
-    .compile(authCode, authSlots)
+    .compile(authComponentCode, authSlots)
     .withSupportsAllTypes();
 
   let seed = config.seed;
@@ -82,7 +83,7 @@ export async function createMultisigAccount(
 
   const result = accountBuilder.build();
 
-  await webClient.newAccount(result.account, false);
+  await midenClient.accounts.insert({ account: result.account, overwrite: false });
 
   return {
     account: result.account,

package/src/account/masm/account-components/auth.ts

@@ -5,12 +5,11 @@ export const MULTISIG_ACCOUNT_COMPONENT_MASM = `# Multi-Signature RPO Falcon 512
 
 use openzeppelin::auth::multisig
 
-type BeWord = struct @bigendian { a: felt, b: felt, c: felt, d: felt }
-
 pub use multisig::update_signers_and_threshold
 pub use multisig::update_procedure_threshold
 
-pub proc auth_tx_multisig(salt: BeWord)
+@auth_script
+pub proc auth_tx_multisig(salt: word)
     exec.multisig::auth_tx
     exec.multisig::assert_new_tx
 end
@@ -21,14 +20,13 @@ export const MULTISIG_GUARDIAN_ACCOUNT_COMPONENT_MASM = `# Multi-Signature RPO F
 use openzeppelin::auth::multisig
 use openzeppelin::auth::guardian
 
-type BeWord = struct @bigendian { a: felt, b: felt, c: felt, d: felt }
-
 pub use multisig::update_signers_and_threshold
 pub use multisig::update_procedure_threshold
 pub use guardian::update_guardian_public_key
 pub use guardian::verify_guardian_signature
 
-pub proc auth_tx_multisig_guardian(salt: BeWord)
+@auth_script
+pub proc auth_tx_multisig_guardian(salt: word)
     exec.multisig::auth_tx
     exec.guardian::verify_guardian_signature
     exec.multisig::assert_new_tx
@@ -39,12 +37,11 @@ export const MULTISIG_ECDSA_ACCOUNT_COMPONENT_MASM = `# Multi-Signature ECDSA se
 
 use openzeppelin::auth::multisig_ecdsa
 
-type BeWord = struct @bigendian { a: felt, b: felt, c: felt, d: felt }
-
 pub use multisig_ecdsa::update_signers_and_threshold
 pub use multisig_ecdsa::update_procedure_threshold
 
-pub proc auth_tx_multisig_ecdsa(salt: BeWord)
+@auth_script
+pub proc auth_tx_multisig_ecdsa(salt: word)
     exec.multisig_ecdsa::auth_tx
     exec.multisig_ecdsa::assert_new_tx
 end
@@ -55,14 +52,13 @@ export const MULTISIG_GUARDIAN_ECDSA_ACCOUNT_COMPONENT_MASM = `# Multi-Signature
 use openzeppelin::auth::multisig_ecdsa
 use openzeppelin::auth::guardian_ecdsa
 
-type BeWord = struct @bigendian { a: felt, b: felt, c: felt, d: felt }
-
 pub use multisig_ecdsa::update_signers_and_threshold
 pub use multisig_ecdsa::update_procedure_threshold
 pub use guardian_ecdsa::update_guardian_public_key
 pub use guardian_ecdsa::verify_guardian_signature
 
-pub proc auth_tx_multisig_guardian_ecdsa(salt: BeWord)
+@auth_script
+pub proc auth_tx_multisig_guardian_ecdsa(salt: word)
     exec.multisig_ecdsa::auth_tx
     exec.guardian_ecdsa::verify_guardian_signature
     exec.multisig_ecdsa::assert_new_tx