@bloxchain/sdk 1.0.0-alpha.2 → 1.0.0-alpha.21

package/{abi → dist/abi}/SimpleVaultDefinitions.abi.json

@@ -186,6 +186,11 @@
             "name": "supportedActionsBitmap",
             "type": "uint16"
           },
+          {
+            "internalType": "bool",
+            "name": "enforceHandlerRelations",
+            "type": "bool"
+          },
           {
             "internalType": "bool",
             "name": "isProtected",

package/dist/abi.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Re-exports contract ABIs for use by consumers (e.g. error decoding).
+ * Import from '@bloxchain/sdk/abi'.
+ */
+/** EngineBlox contract ABI (full). */
+export declare const engineBloxAbi: readonly unknown[];
+/** EngineBlox ABI entries for custom errors only (for decodeErrorResult). */
+export declare const engineBloxErrorAbi: {
+    type?: string;
+}[];
+//# sourceMappingURL=abi.d.ts.map

package/dist/abi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../abi.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,sCAAsC;AACtC,eAAO,MAAM,aAAa,EAAwB,SAAS,OAAO,EAAE,CAAC;AAErE,6EAA6E;AAC7E,eAAO,MAAM,kBAAkB;WAAoC,MAAM;GAExE,CAAC"}

package/dist/abi.js

@@ -0,0 +1,10 @@
+/**
+ * Re-exports contract ABIs for use by consumers (e.g. error decoding).
+ * Import from '@bloxchain/sdk/abi'.
+ */
+import engineBloxAbiJson from './abi/EngineBlox.abi.json';
+/** EngineBlox contract ABI (full). */
+export const engineBloxAbi = engineBloxAbiJson;
+/** EngineBlox ABI entries for custom errors only (for decodeErrorResult). */
+export const engineBloxErrorAbi = engineBloxAbi.filter((item) => item.type === 'error');
+//# sourceMappingURL=abi.js.map

package/dist/abi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abi.js","sourceRoot":"","sources":["../abi.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAE1D,sCAAsC;AACtC,MAAM,CAAC,MAAM,aAAa,GAAG,iBAAuC,CAAC;AAErE,6EAA6E;AAC7E,MAAM,CAAC,MAAM,kBAAkB,GAAI,aAA0C,CAAC,MAAM,CAClF,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAChC,CAAC"}

package/dist/contracts/{BaseStateMachine.d.ts → core/BaseStateMachine.d.ts}

@@ -1,8 +1,9 @@
 import { Address, PublicClient, WalletClient, Chain, Hex } from 'viem';
-import { TransactionOptions, TransactionResult } from '../interfaces/base.index';
-import { IBaseStateMachine } from '../interfaces/base.state.machine.index';
-import { TxRecord, MetaTransaction, MetaTxParams } from '../interfaces/lib.index';
-import { TxAction } from '../types/lib.index';
+import { TransactionOptions, TransactionResult } from '../../interfaces/base.index';
+import { IBaseStateMachine } from '../../interfaces/base.state.machine.index';
+import { TxRecord, MetaTransaction, MetaTxParams } from '../../interfaces/lib.index';
+import { TxAction } from '../../types/lib.index';
+import { FunctionSchema } from '../../types/definition.index';
 /**
  * @title BaseStateMachine
  * @notice TypeScript wrapper for BaseStateMachine smart contract with common utilities
@@ -29,6 +30,7 @@ export declare abstract class BaseStateMachine implements IBaseStateMachine {
     createMetaTxParams(handlerContract: Address, handlerSelector: Hex, action: TxAction, deadline: bigint, maxGasPrice: bigint, signer: Address): Promise<MetaTxParams>;
     generateUnsignedMetaTransactionForNew(requester: Address, target: Address, value: bigint, gasLimit: bigint, operationType: Hex, executionSelector: Hex, executionParams: Hex, metaTxParams: MetaTxParams): Promise<MetaTransaction>;
     generateUnsignedMetaTransactionForExisting(txId: bigint, metaTxParams: MetaTxParams): Promise<MetaTransaction>;
+    /** Returns `[]` when there are no txs yet or the clamped id range does not overlap `1..txCounter`. */
     getTransactionHistory(fromTxId: bigint, toTxId: bigint): Promise<TxRecord[]>;
     getTransaction(txId: bigint): Promise<TxRecord>;
     getPendingTransactions(): Promise<bigint[]>;
@@ -48,9 +50,15 @@ export declare abstract class BaseStateMachine implements IBaseStateMachine {
      * @notice This function uses the reverse index for efficient lookup
      */
     getWalletRoles(wallet: Address): Promise<Hex[]>;
-    isActionSupportedByFunction(functionSelector: Hex, action: TxAction): Promise<boolean>;
+    /**
+     * Gets all authorized wallets for a role
+     * @param roleHash The role hash to get wallets for
+     * @returns Array of authorized wallet addresses
+     * @notice Requires caller to have any role for privacy protection
+     */
+    getAuthorizedWallets(roleHash: Hex): Promise<Address[]>;
     getActiveRolePermissions(roleHash: Hex): Promise<any[]>;
-    functionSchemaExists(functionSelector: Hex): Promise<boolean>;
+    getFunctionSchema(functionSelector: Hex): Promise<FunctionSchema>;
     getSignerNonce(signer: Address): Promise<bigint>;
     getSupportedOperationTypes(): Promise<Hex[]>;
     getSupportedRoles(): Promise<Hex[]>;
@@ -72,6 +80,12 @@ export declare abstract class BaseStateMachine implements IBaseStateMachine {
      * @return The recovery address
      */
     getRecovery(): Promise<Address>;
+    /**
+     * @dev Returns all hook contracts registered for a function selector
+     * @param functionSelector The function selector to query hooks for
+     * @return Array of hook contract addresses
+     */
+    getHooks(functionSelector: Hex): Promise<Address[]>;
     supportsInterface(interfaceId: Hex): Promise<boolean>;
     /**
      * @dev Check if this contract supports IBaseStateMachine interface

package/dist/contracts/core/BaseStateMachine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseStateMachine.d.ts","sourceRoot":"","sources":["../../../contracts/core/BaseStateMachine.tsx"],"names":[],"mappings":"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"}

package/dist/contracts/{BaseStateMachine.js → core/BaseStateMachine.js}

@@ -1,4 +1,5 @@
-import { handleViemError } from '../utils/viem-error-handler';
+import { parseGwei } from 'viem';
+import { handleViemError } from '../../utils/viem-error-handler';
 /**
  * @title BaseStateMachine
  * @notice TypeScript wrapper for BaseStateMachine smart contract with common utilities
@@ -30,29 +31,6 @@ export class BaseStateMachine {
         // Otherwise, let Viem use the WalletClient's account automatically
         const walletClientAccount = this.walletClient.account?.address;
         const requestedAccount = options.from.toLowerCase();
-        // For meta-transaction functions, ensure the structure is correct
-        if (functionName.includes('RequestAndApprove') || functionName.includes('MetaTx')) {
-            if (args.length > 0 && args[0] && typeof args[0] === 'object' && 'txRecord' in args[0]) {
-                const metaTx = args[0];
-                // Ensure all nested structures are properly formatted
-                if (metaTx.txRecord && typeof metaTx.txRecord === 'object') {
-                    // Ensure txRecord.params exists and is an object
-                    if (!metaTx.txRecord.params || typeof metaTx.txRecord.params !== 'object') {
-                        throw new Error('Invalid meta-transaction: txRecord.params must be an object');
-                    }
-                    // Ensure txRecord.payment exists and is an object
-                    if (!metaTx.txRecord.payment || typeof metaTx.txRecord.payment !== 'object') {
-                        throw new Error('Invalid meta-transaction: txRecord.payment must be an object');
-                    }
-                }
-                if (metaTx.params && typeof metaTx.params === 'object') {
-                    // Ensure params is properly formatted
-                    if (typeof metaTx.params.action !== 'number') {
-                        throw new Error('Invalid meta-transaction: params.action must be a number');
-                    }
-                }
-            }
-        }
         const writeContractParams = {
             chain: this.chain,
             address: this.contractAddress,
@@ -65,17 +43,74 @@ export class BaseStateMachine {
         if (!walletClientAccount || walletClientAccount.toLowerCase() !== requestedAccount) {
             writeContractParams.account = options.from;
         }
+        // Determine how strictly to enforce pre-flight simulation.
+        const simulationMode = options.simulationMode ?? 'strict';
         try {
-            // First, simulate the contract call to get better error messages
-            try {
-                await this.client.simulateContract({
-                    ...writeContractParams,
-                    account: writeContractParams.account || this.walletClient.account
-                });
+            // Simulate the contract call first for better error messages (no gas params for eth_call).
+            if (simulationMode !== 'skip') {
+                try {
+                    await this.client.simulateContract({
+                        ...writeContractParams,
+                        account: writeContractParams.account || this.walletClient.account
+                    });
+                }
+                catch (simulateError) {
+                    if (simulationMode === 'strict') {
+                        throw simulateError;
+                    }
+                    const msg = simulateError?.shortMessage ??
+                        simulateError?.message ??
+                        simulateError?.cause?.shortMessage ??
+                        simulateError?.cause?.message ??
+                        String(simulateError);
+                    // eslint-disable-next-line no-console
+                    console.warn(`[BaseStateMachine] Pre-flight simulation failed for ${functionName} (mode=${simulationMode}); continuing to send tx: ${msg}`);
+                }
+            }
+            // Forward explicit gas limit when provided so callers can bypass eth_estimateGas.
+            if (options.gas !== undefined) {
+                const rawGas = options.gas;
+                let gasLimit;
+                if (typeof rawGas === 'bigint') {
+                    gasLimit = rawGas;
+                }
+                else if (typeof rawGas === 'number') {
+                    if (!Number.isSafeInteger(rawGas) || rawGas < 0) {
+                        throw new Error(`Invalid gas: number inputs must be non-negative safe integers (got "${rawGas}"). ` +
+                            'Use a bigint or decimal string for larger values.');
+                    }
+                    gasLimit = BigInt(rawGas);
+                }
+                else {
+                    const s = String(rawGas).trim();
+                    if (!/^\d+$/.test(s)) {
+                        throw new Error(`Invalid gas: must be a non-negative integer (got "${options.gas}"). Use a number-like value, decimal string, or bigint.`);
+                    }
+                    gasLimit = BigInt(s);
+                }
+                if (gasLimit < 0n) {
+                    throw new Error(`Invalid gas: must be non-negative (got ${gasLimit.toString()})`);
+                }
+                writeContractParams.gas = gasLimit;
             }
-            catch (simulateError) {
-                // Re-throw to get better error handling
-                throw simulateError;
+            // Add gas price override for write only (EIP-1559); viem rejects mixing gasPrice with maxFeePerGas.
+            if (options.gasPrice !== undefined && options.gasPrice !== '') {
+                const raw = options.gasPrice;
+                let gasPriceWei;
+                if (typeof raw === 'bigint') {
+                    gasPriceWei = raw;
+                }
+                else {
+                    const s = String(raw).trim();
+                    if (!/^\d+$/.test(s)) {
+                        throw new Error(`Invalid gas price: must be a non-negative integer (got "${options.gasPrice}"). Use wei as a string or bigint.`);
+                    }
+                    gasPriceWei = BigInt(s);
+                }
+                writeContractParams.maxFeePerGas = gasPriceWei;
+                // Use a separate priority fee so when base fee is high the tip does not go to zero (avoids tx stalling).
+                const oneGwei = parseGwei('1');
+                writeContractParams.maxPriorityFeePerGas = gasPriceWei <= oneGwei ? gasPriceWei : oneGwei;
             }
             const hash = await this.walletClient.writeContract(writeContractParams);
             return {
@@ -157,6 +192,7 @@ export class BaseStateMachine {
         ]);
     }
     // ============ STATE QUERIES ============
+    /** Returns `[]` when there are no txs yet or the clamped id range does not overlap `1..txCounter`. */
     async getTransactionHistory(fromTxId, toTxId) {
         return this.executeReadContract('getTransactionHistory', [fromTxId, toTxId]);
     }
@@ -183,14 +219,20 @@ export class BaseStateMachine {
     async getWalletRoles(wallet) {
         return this.executeReadContract('getWalletRoles', [wallet]);
     }
-    async isActionSupportedByFunction(functionSelector, action) {
-        return this.executeReadContract('isActionSupportedByFunction', [functionSelector, action]);
+    /**
+     * Gets all authorized wallets for a role
+     * @param roleHash The role hash to get wallets for
+     * @returns Array of authorized wallet addresses
+     * @notice Requires caller to have any role for privacy protection
+     */
+    async getAuthorizedWallets(roleHash) {
+        return this.executeReadContract('getAuthorizedWallets', [roleHash]);
     }
     async getActiveRolePermissions(roleHash) {
         return this.executeReadContract('getActiveRolePermissions', [roleHash]);
     }
-    async functionSchemaExists(functionSelector) {
-        return this.executeReadContract('functionSchemaExists', [functionSelector]);
+    async getFunctionSchema(functionSelector) {
+        return this.executeReadContract('getFunctionSchema', [functionSelector]);
     }
     async getSignerNonce(signer) {
         return this.executeReadContract('getSignerNonce', [signer]);
@@ -233,6 +275,14 @@ export class BaseStateMachine {
     async getRecovery() {
         return this.executeReadContract('getRecovery');
     }
+    /**
+     * @dev Returns all hook contracts registered for a function selector
+     * @param functionSelector The function selector to query hooks for
+     * @return Array of hook contract addresses
+     */
+    async getHooks(functionSelector) {
+        return this.executeReadContract('getHooks', [functionSelector]);
+    }
     // ============ INTERFACE SUPPORT ============
     async supportsInterface(interfaceId) {
         return this.executeReadContract('supportsInterface', [interfaceId]);
@@ -243,7 +293,7 @@ export class BaseStateMachine {
      */
     async supportsBaseStateMachineInterface() {
         // Import dynamically to avoid circular dependencies
-        const { INTERFACE_IDS } = await import('../utils/interface-ids');
+        const { INTERFACE_IDS } = await import('../../utils/interface-ids');
         return this.supportsInterface(INTERFACE_IDS.IBaseStateMachine);
     }
 }

package/dist/contracts/core/BaseStateMachine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseStateMachine.js","sourceRoot":"","sources":["../../../contracts/core/BaseStateMachine.tsx"],"names":[],"mappings":"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"}

package/dist/contracts/{GuardController.d.ts → core/GuardController.d.ts}

@@ -1,7 +1,7 @@
 import { Address, PublicClient, WalletClient, Chain, Hex } from 'viem';
-import { TransactionOptions, TransactionResult } from '../interfaces/base.index';
-import { IGuardController } from '../interfaces/core.execution.index';
-import { MetaTransaction } from '../interfaces/lib.index';
+import { TransactionOptions, TransactionResult } from '../../interfaces/base.index';
+import { IGuardController } from '../../interfaces/core.execution.index';
+import { MetaTransaction } from '../../interfaces/lib.index';
 import { BaseStateMachine } from './BaseStateMachine';
 /**
  * @title GuardController
@@ -43,6 +43,23 @@ export declare class GuardController extends BaseStateMachine implements IGuardC
      * @notice For simple ETH transfers: value>0, functionSelector=0x00000000, params=""
      */
     executeWithTimeLock(target: Address, value: bigint, functionSelector: Hex, params: Hex, gasLimit: bigint, operationType: Hex, options: TransactionOptions): Promise<TransactionResult>;
+    /**
+     * @dev Requests a time-locked execution with payment details
+     * @param target The address of the target contract
+     * @param value The ETH value to send
+     * @param functionSelector The function selector to execute
+     * @param params The encoded parameters for the function
+     * @param gasLimit The gas limit for execution
+     * @param operationType The operation type hash
+     * @param paymentDetails Payment details (recipient, nativeTokenAmount, erc20TokenAddress, erc20TokenAmount)
+     * @param options Transaction options including from address
+     */
+    executeWithPayment(target: Address, value: bigint, functionSelector: Hex, params: Hex, gasLimit: bigint, operationType: Hex, paymentDetails: {
+        recipient: Address;
+        nativeTokenAmount: bigint;
+        erc20TokenAddress: Address;
+        erc20TokenAmount: bigint;
+    }, options: TransactionOptions): Promise<TransactionResult>;
     /**
      * @dev Approves and executes a time-locked transaction
      * @param txId The transaction ID
@@ -85,15 +102,6 @@ export declare class GuardController extends BaseStateMachine implements IGuardC
      * @notice Requires EXECUTE_META_REQUEST_AND_APPROVE permission for the execution function selector
      */
     requestAndApproveExecution(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
-    /**
-     * @dev Creates execution params for a guard configuration batch (definition helper; no contract call)
-     * @param actions Guard configuration actions
-     * @return Promise<Hex> The execution params to be used in a meta-transaction
-     */
-    guardConfigBatchExecutionParams(actions: Array<{
-        actionType: number;
-        data: Hex;
-    }>): Promise<Hex>;
     /**
      * @dev Requests and approves a guard configuration batch using a meta-transaction
      * @param metaTx The meta-transaction describing the guard configuration batch
@@ -104,12 +112,11 @@ export declare class GuardController extends BaseStateMachine implements IGuardC
      */
     guardConfigBatchRequestAndApprove(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
     /**
-     * @dev Gets all whitelisted targets for a function selector.
+     * @dev Gets all whitelisted targets for a function selector (from BaseStateMachine).
      * @param functionSelector The function selector
      * @return Promise<Address[]> Array of whitelisted target addresses
-     * @notice Requires caller to have any role (via _validateAnyRole) for privacy protection
      */
-    getAllowedTargets(functionSelector: Hex): Promise<Address[]>;
+    getFunctionWhitelistTargets(functionSelector: Hex): Promise<Address[]>;
     /**
      * @dev Check if this contract supports IGuardController interface
      * @return Promise<boolean> indicating if IGuardController is supported

package/dist/contracts/core/GuardController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GuardController.d.ts","sourceRoot":"","sources":["../../../contracts/core/GuardController.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD;;;;;;;;;;GAUG;AACH,qBAAa,eAAgB,SAAQ,gBAAiB,YAAW,gBAAgB;gBAE7E,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,KAAK;IAOd;;;;;;;;;OASG;IACG,UAAU,CACd,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,OAAO,EACjB,iBAAiB,EAAE,MAAM,EACzB,cAAc,EAAE,OAAO,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAU7B;;;;;;;;;;;;;;OAcG;IACG,mBAAmB,CACvB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;;;;;OAUG;IACG,kBAAkB,CACtB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,GAAG,EAClB,cAAc,EAAE;QACd,SAAS,EAAE,OAAO,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,gBAAgB,EAAE,MAAM,CAAC;KAC1B,EACD,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;OAMG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;OAMG;IACG,uBAAuB,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;OAMG;IACG,kCAAkC,CACtC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;OAMG;IACG,iCAAiC,CACrC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAQ7B;;;;;;;;OAQG;IACG,0BAA0B,CAC9B,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAU7B;;;;;;;OAOG;IACG,iCAAiC,CACrC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAI7B;;;;OAIG;IACG,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAM5E;;;OAGG;IACG,gCAAgC,IAAI,OAAO,CAAC,OAAO,CAAC;CAG3D;AAED,eAAe,eAAe,CAAC"}

package/dist/contracts/{GuardController.js → core/GuardController.js}

@@ -1,7 +1,6 @@
-import GuardControllerABIJson from '../abi/GuardController.abi.json';
+import GuardControllerABIJson from '../../abi/GuardController.abi.json';
 import { BaseStateMachine } from './BaseStateMachine';
-import { INTERFACE_IDS } from '../utils/interface-ids';
-import { guardConfigBatchExecutionParams as defGuardConfigBatchExecutionParams } from '../lib/definitions/GuardControllerDefinitions';
+import { INTERFACE_IDS } from '../../utils/interface-ids';
 /**
  * @title GuardController
  * @notice TypeScript wrapper for GuardController smart contract
@@ -50,6 +49,20 @@ export class GuardController extends BaseStateMachine {
     async executeWithTimeLock(target, value, functionSelector, params, gasLimit, operationType, options) {
         return this.executeWriteContract('executeWithTimeLock', [target, value, functionSelector, params, gasLimit, operationType], options);
     }
+    /**
+     * @dev Requests a time-locked execution with payment details
+     * @param target The address of the target contract
+     * @param value The ETH value to send
+     * @param functionSelector The function selector to execute
+     * @param params The encoded parameters for the function
+     * @param gasLimit The gas limit for execution
+     * @param operationType The operation type hash
+     * @param paymentDetails Payment details (recipient, nativeTokenAmount, erc20TokenAddress, erc20TokenAmount)
+     * @param options Transaction options including from address
+     */
+    async executeWithPayment(target, value, functionSelector, params, gasLimit, operationType, paymentDetails, options) {
+        return this.executeWriteContract('executeWithPayment', [target, value, functionSelector, params, gasLimit, operationType, paymentDetails], options);
+    }
     /**
      * @dev Approves and executes a time-locked transaction
      * @param txId The transaction ID
@@ -103,14 +116,6 @@ export class GuardController extends BaseStateMachine {
         return this.executeWriteContract('requestAndApproveExecution', [metaTx], options);
     }
     // ============ GUARD CONFIGURATION BATCH ============
-    /**
-     * @dev Creates execution params for a guard configuration batch (definition helper; no contract call)
-     * @param actions Guard configuration actions
-     * @return Promise<Hex> The execution params to be used in a meta-transaction
-     */
-    async guardConfigBatchExecutionParams(actions) {
-        return Promise.resolve(defGuardConfigBatchExecutionParams(actions));
-    }
     /**
      * @dev Requests and approves a guard configuration batch using a meta-transaction
      * @param metaTx The meta-transaction describing the guard configuration batch
@@ -123,19 +128,12 @@ export class GuardController extends BaseStateMachine {
         return this.executeWriteContract('guardConfigBatchRequestAndApprove', [metaTx], options);
     }
     /**
-     * @dev Gets all whitelisted targets for a function selector.
+     * @dev Gets all whitelisted targets for a function selector (from BaseStateMachine).
      * @param functionSelector The function selector
      * @return Promise<Address[]> Array of whitelisted target addresses
-     * @notice Requires caller to have any role (via _validateAnyRole) for privacy protection
      */
-    async getAllowedTargets(functionSelector) {
-        const result = await this.executeReadContract('getAllowedTargets', [
-            functionSelector
-        ]);
-        if (!Array.isArray(result)) {
-            throw new Error(`Unexpected return type from getAllowedTargets: ${typeof result}`);
-        }
-        return result;
+    async getFunctionWhitelistTargets(functionSelector) {
+        return this.executeReadContract('getFunctionWhitelistTargets', [functionSelector]);
     }
     // ============ INTERFACE SUPPORT ============
     /**

package/dist/contracts/core/GuardController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GuardController.js","sourceRoot":"","sources":["../../../contracts/core/GuardController.tsx"],"names":[],"mappings":"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"}

package/dist/contracts/core/RuntimeRBAC.d.ts

@@ -0,0 +1,27 @@
+import { Address, PublicClient, WalletClient, Chain } from 'viem';
+import { TransactionOptions, TransactionResult } from '../../interfaces/base.index';
+import { IRuntimeRBAC } from '../../interfaces/core.access.index';
+import { MetaTransaction } from '../../interfaces/lib.index';
+import { BaseStateMachine } from './BaseStateMachine';
+/**
+ * @title RuntimeRBAC
+ * @notice TypeScript wrapper for RuntimeRBAC smart contract
+ * @dev Matches the actual Solidity contract implementation
+ * @dev Extends BaseStateMachine directly for modular architecture
+ */
+export declare class RuntimeRBAC extends BaseStateMachine implements IRuntimeRBAC {
+    constructor(client: PublicClient, walletClient: WalletClient | undefined, contractAddress: Address, chain: Chain);
+    /**
+     * @dev Requests and approves a RBAC configuration batch using a meta-transaction
+     * @param metaTx The meta-transaction
+     * @param options Transaction options
+     */
+    roleConfigBatchRequestAndApprove(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
+    /**
+     * @dev Check if this contract supports IRuntimeRBAC interface
+     * @return Promise<boolean> indicating if IRuntimeRBAC is supported
+     */
+    supportsRuntimeRBACInterface(): Promise<boolean>;
+}
+export default RuntimeRBAC;
+//# sourceMappingURL=RuntimeRBAC.d.ts.map

package/dist/contracts/core/RuntimeRBAC.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeRBAC.d.ts","sourceRoot":"","sources":["../../../contracts/core/RuntimeRBAC.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAO,MAAM,MAAM,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD;;;;;GAKG;AACH,qBAAa,WAAY,SAAQ,gBAAiB,YAAW,YAAY;gBAErE,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,KAAK;IAOd;;;;OAIG;IACG,gCAAgC,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IAM7B;;;OAGG;IACG,4BAA4B,IAAI,OAAO,CAAC,OAAO,CAAC;CAIvD;AAED,eAAe,WAAW,CAAC"}

package/dist/contracts/core/RuntimeRBAC.js

@@ -0,0 +1,33 @@
+import RuntimeRBACABIJson from '../../abi/RuntimeRBAC.abi.json';
+import { BaseStateMachine } from './BaseStateMachine';
+import { INTERFACE_IDS } from '../../utils/interface-ids';
+/**
+ * @title RuntimeRBAC
+ * @notice TypeScript wrapper for RuntimeRBAC smart contract
+ * @dev Matches the actual Solidity contract implementation
+ * @dev Extends BaseStateMachine directly for modular architecture
+ */
+export class RuntimeRBAC extends BaseStateMachine {
+    constructor(client, walletClient, contractAddress, chain) {
+        super(client, walletClient, contractAddress, chain, RuntimeRBACABIJson);
+    }
+    // ============ ROLE CONFIGURATION BATCH ============
+    /**
+     * @dev Requests and approves a RBAC configuration batch using a meta-transaction
+     * @param metaTx The meta-transaction
+     * @param options Transaction options
+     */
+    async roleConfigBatchRequestAndApprove(metaTx, options) {
+        return this.executeWriteContract('roleConfigBatchRequestAndApprove', [metaTx], options);
+    }
+    // ============ INTERFACE SUPPORT ============
+    /**
+     * @dev Check if this contract supports IRuntimeRBAC interface
+     * @return Promise<boolean> indicating if IRuntimeRBAC is supported
+     */
+    async supportsRuntimeRBACInterface() {
+        return this.supportsInterface(INTERFACE_IDS.IRuntimeRBAC);
+    }
+}
+export default RuntimeRBAC;
+//# sourceMappingURL=RuntimeRBAC.js.map

package/dist/contracts/core/RuntimeRBAC.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeRBAC.js","sourceRoot":"","sources":["../../../contracts/core/RuntimeRBAC.tsx"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAIhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,OAAO,WAAY,SAAQ,gBAAgB;IAC/C,YACE,MAAoB,EACpB,YAAsC,EACtC,eAAwB,EACxB,KAAY;QAEZ,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1E,CAAC;IAED,qDAAqD;IAErD;;;;OAIG;IACH,KAAK,CAAC,gCAAgC,CACpC,MAAuB,EACvB,OAA2B;QAE3B,OAAO,IAAI,CAAC,oBAAoB,CAAC,kCAAkC,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1F,CAAC;IAED,8CAA8C;IAE9C;;;OAGG;IACH,KAAK,CAAC,4BAA4B;QAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC5D,CAAC;CAEF;AAED,eAAe,WAAW,CAAC"}

package/dist/contracts/{SecureOwnable.d.ts → core/SecureOwnable.d.ts}

@@ -1,7 +1,7 @@
-import { Address, PublicClient, WalletClient, Chain, Hex } from 'viem';
-import { TransactionOptions, TransactionResult } from '../interfaces/base.index';
-import { ISecureOwnable } from '../interfaces/core.security.index';
-import { MetaTransaction } from '../interfaces/lib.index';
+import { Address, PublicClient, WalletClient, Chain } from 'viem';
+import { TransactionOptions, TransactionResult } from '../../interfaces/base.index';
+import { ISecureOwnable } from '../../interfaces/core.security.index';
+import { MetaTransaction } from '../../interfaces/lib.index';
 import { BaseStateMachine } from './BaseStateMachine';
 /**
  * @title SecureOwnable
@@ -14,22 +14,12 @@ export declare class SecureOwnable extends BaseStateMachine implements ISecureOw
     transferOwnershipApprovalWithMetaTx(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
     transferOwnershipCancellation(txId: bigint, options: TransactionOptions): Promise<TransactionResult>;
     transferOwnershipCancellationWithMetaTx(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
-    updateBroadcasterRequest(newBroadcaster: Address, options: TransactionOptions): Promise<TransactionResult>;
+    updateBroadcasterRequest(newBroadcaster: Address, currentBroadcaster: Address, options: TransactionOptions): Promise<TransactionResult>;
     updateBroadcasterDelayedApproval(txId: bigint, options: TransactionOptions): Promise<TransactionResult>;
     updateBroadcasterApprovalWithMetaTx(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
     updateBroadcasterCancellation(txId: bigint, options: TransactionOptions): Promise<TransactionResult>;
     updateBroadcasterCancellationWithMetaTx(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
-    /**
-     * @dev Wrapper matching ISecureOwnable interface; delegates to definition helper (no contract call)
-     */
-    updateRecoveryExecutionOptions(newRecoveryAddress: Address): Promise<Hex>;
-    updateRecoveryExecutionParams(newRecoveryAddress: Address): Promise<Hex>;
     updateRecoveryRequestAndApprove(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
-    /**
-     * @dev Wrapper matching ISecureOwnable interface; delegates to definition helper (no contract call)
-     */
-    updateTimeLockExecutionOptions(newTimeLockPeriodSec: bigint): Promise<Hex>;
-    updateTimeLockExecutionParams(newTimeLockPeriodSec: bigint): Promise<Hex>;
     updateTimeLockRequestAndApprove(metaTx: MetaTransaction, options: TransactionOptions): Promise<TransactionResult>;
     /**
      * @dev Check if this contract supports ISecureOwnable interface

package/dist/contracts/core/SecureOwnable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SecureOwnable.d.ts","sourceRoot":"","sources":["../../../contracts/core/SecureOwnable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAO,MAAM,MAAM,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD;;;GAGG;AACH,qBAAa,aAAc,SAAQ,gBAAiB,YAAW,cAAc;gBAEzE,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,KAAK;IAMR,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIjF,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIvG,mCAAmC,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIrH,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIpG,uCAAuC,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKzH,wBAAwB,CAAC,cAAc,EAAE,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIvI,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIvG,mCAAmC,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIrH,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIpG,uCAAuC,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKzH,+BAA+B,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKjH,+BAA+B,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAMvH;;;OAGG;IACG,8BAA8B,IAAI,OAAO,CAAC,OAAO,CAAC;CAGzD;AAED,eAAe,aAAa,CAAC"}

package/dist/contracts/{SecureOwnable.js → core/SecureOwnable.js}

@@ -1,7 +1,6 @@
-import SecureOwnableABIJson from '../abi/SecureOwnable.abi.json';
+import SecureOwnableABIJson from '../../abi/SecureOwnable.abi.json';
 import { BaseStateMachine } from './BaseStateMachine';
-import { INTERFACE_IDS } from '../utils/interface-ids';
-import { updateRecoveryExecutionParams as defUpdateRecoveryExecutionParams, updateTimeLockExecutionParams as defUpdateTimeLockExecutionParams } from '../lib/definitions/SecureOwnableDefinitions';
+import { INTERFACE_IDS } from '../../utils/interface-ids';
 /**
  * @title SecureOwnable
  * @notice TypeScript wrapper for SecureOwnable smart contract
@@ -27,8 +26,8 @@ export class SecureOwnable extends BaseStateMachine {
         return this.executeWriteContract('transferOwnershipCancellationWithMetaTx', [metaTx], options);
     }
     // Broadcaster Management
-    async updateBroadcasterRequest(newBroadcaster, options) {
-        return this.executeWriteContract('updateBroadcasterRequest', [newBroadcaster], options);
+    async updateBroadcasterRequest(newBroadcaster, currentBroadcaster, options) {
+        return this.executeWriteContract('updateBroadcasterRequest', [newBroadcaster, currentBroadcaster], options);
     }
     async updateBroadcasterDelayedApproval(txId, options) {
         return this.executeWriteContract('updateBroadcasterDelayedApproval', [txId], options);
@@ -43,28 +42,10 @@ export class SecureOwnable extends BaseStateMachine {
         return this.executeWriteContract('updateBroadcasterCancellationWithMetaTx', [metaTx], options);
     }
     // Recovery Management
-    /**
-     * @dev Wrapper matching ISecureOwnable interface; delegates to definition helper (no contract call)
-     */
-    async updateRecoveryExecutionOptions(newRecoveryAddress) {
-        return this.updateRecoveryExecutionParams(newRecoveryAddress);
-    }
-    async updateRecoveryExecutionParams(newRecoveryAddress) {
-        return Promise.resolve(defUpdateRecoveryExecutionParams(newRecoveryAddress));
-    }
     async updateRecoveryRequestAndApprove(metaTx, options) {
         return this.executeWriteContract('updateRecoveryRequestAndApprove', [metaTx], options);
     }
     // TimeLock Management
-    /**
-     * @dev Wrapper matching ISecureOwnable interface; delegates to definition helper (no contract call)
-     */
-    async updateTimeLockExecutionOptions(newTimeLockPeriodSec) {
-        return this.updateTimeLockExecutionParams(newTimeLockPeriodSec);
-    }
-    async updateTimeLockExecutionParams(newTimeLockPeriodSec) {
-        return Promise.resolve(defUpdateTimeLockExecutionParams(newTimeLockPeriodSec));
-    }
     async updateTimeLockRequestAndApprove(metaTx, options) {
         return this.executeWriteContract('updateTimeLockRequestAndApprove', [metaTx], options);
     }

package/dist/contracts/core/SecureOwnable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SecureOwnable.js","sourceRoot":"","sources":["../../../contracts/core/SecureOwnable.tsx"],"names":[],"mappings":"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"}