feat: integrate definition contract calls for execution parameters

This commit enhances the GuardController and RuntimeRBAC implementations by replacing local execution parameter generation with calls to their respective deployed definition contracts. This change ensures a single source of truth for action specifications and improves the accuracy of execution parameters. Additionally, it removes outdated local helper functions and updates related documentation to reflect the new approach.

Author: JaCoderX

abi/GuardControllerDefinitions.abi.json

@@ -64,6 +64,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "EXECUTE_WITH_PAYMENT_SELECTOR",
+    "outputs": [
+      {
+        "internalType": "bytes4",
+        "name": "",
+        "type": "bytes4"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "EXECUTE_WITH_TIMELOCK_SELECTOR",

scripts/sanity-sdk/base/test-helpers.ts

@@ -54,6 +54,32 @@ export async function getContractAddressFromArtifacts(
   }
 }
 
+/**
+ * Get definition library address.
+ * Prefer deployed-addresses.json (development) so that after a Hardhat redeploy we use the new addresses.
+ * Fall back to Truffle artifacts (e.g. after truffle migrate).
+ * This avoids VM revert when artifacts point to an old/stale address on a redeployed chain.
+ */
+export async function getDefinitionAddress(contractName: string): Promise<Address> {
+  const deployedPath = path.join(__dirname, '../../../deployed-addresses.json');
+  if (fs.existsSync(deployedPath)) {
+    const deployed = JSON.parse(fs.readFileSync(deployedPath, 'utf8'));
+    const dev = deployed.development;
+    if (dev && dev[contractName]?.address) {
+      console.log(`📋 Using ${contractName} from deployed-addresses.json (development): ${dev[contractName].address}`);
+      return dev[contractName].address as Address;
+    }
+  }
+
+  const fromArtifacts = await getContractAddressFromArtifacts(contractName);
+  if (fromArtifacts) return fromArtifacts;
+
+  throw new Error(
+    `Definition contract address not found for ${contractName}. ` +
+    `Run deploy (truffle migrate or hardhat deploy-foundation-libraries) and ensure deployed-addresses.json or build/contracts has the address.`
+  );
+}
+
 /**
  * Advance blockchain time (for local Ganache)
  */

scripts/sanity-sdk/guard-controller/base-test.ts

@@ -6,12 +6,13 @@
 import { Address, Hex } from 'viem';
 import { GuardController } from '../../../sdk/typescript/contracts/core/GuardController.tsx';
 import { BaseSDKTest, TestWallet } from '../base/BaseSDKTest.ts';
-import { getContractAddressFromArtifacts } from '../base/test-helpers.ts';
+import { getContractAddressFromArtifacts, getDefinitionAddress } from '../base/test-helpers.ts';
 import { getTestConfig } from '../base/test-config.ts';
 import { MetaTransactionSigner } from '../../../sdk/typescript/utils/metaTx/metaTransaction.tsx';
 import { MetaTransaction, MetaTxParams } from '../../../sdk/typescript/interfaces/lib.index.tsx';
 import { TxAction } from '../../../sdk/typescript/types/lib.index.tsx';
 import { GuardConfigActionType, GuardConfigAction } from '../../../sdk/typescript/types/core.execution.index.tsx';
+import { guardConfigBatchExecutionParams } from '../../../sdk/typescript/lib/definitions/GuardControllerDefinitions';
 import { keccak256, encodeAbiParameters, parseAbiParameters } from 'viem';
 
 export interface GuardControllerRoles {
@@ -22,6 +23,8 @@ export interface GuardControllerRoles {
 
 export abstract class BaseGuardControllerTest extends BaseSDKTest {
   protected guardController: GuardController | null = null;
+  /** Deployed GuardControllerDefinitions library address (for execution params) */
+  protected guardControllerDefinitionsAddress: Address | null = null;
   protected roles: GuardControllerRoles = {
     owner: '0x' as Address,
     broadcaster: '0x' as Address,
@@ -70,6 +73,8 @@ export abstract class BaseGuardControllerTest extends BaseSDKTest {
       throw new Error('Contract address not set');
     }
 
+    this.guardControllerDefinitionsAddress = await getDefinitionAddress('GuardControllerDefinitions');
+
     // Create a wallet client for the owner (default)
     const walletClient = this.createWalletClient('wallet1');
 
@@ -298,9 +303,12 @@ export abstract class BaseGuardControllerTest extends BaseSDKTest {
       },
     ];
 
-    // Get execution params using the new batch method
+    // Get execution params using the new batch method (via definition contract)
+    if (!this.guardControllerDefinitionsAddress) {
+      throw new Error('GuardControllerDefinitions address not set');
+    }
     console.log(`    📋 Getting execution params for guard config batch...`);
-    const executionParams = await this.guardController.guardConfigBatchExecutionParams(actions);
+    const executionParams = await guardConfigBatchExecutionParams(this.publicClient, this.guardControllerDefinitionsAddress!, actions);
     console.log(`    ✅ Execution params obtained`);
 
     // Create meta-tx params
@@ -381,9 +389,12 @@ export abstract class BaseGuardControllerTest extends BaseSDKTest {
       },
     ];
 
-    // Get execution params using the new batch method
+    // Get execution params using the new batch method (via definition contract)
+    if (!this.guardControllerDefinitionsAddress) {
+      throw new Error('GuardControllerDefinitions address not set');
+    }
     console.log(`    📋 Getting execution params for guard config batch (function registration)...`);
-    const executionParams = await this.guardController.guardConfigBatchExecutionParams(actions);
+    const executionParams = await guardConfigBatchExecutionParams(this.publicClient, this.guardControllerDefinitionsAddress!, actions);
     console.log(`    ✅ Execution params obtained`);
 
     // Create meta-tx params

scripts/sanity-sdk/run-all-tests.ts

@@ -25,9 +25,7 @@ class SanitySDKTestRunner {
     'guard-controller': resolve(__dirname, 'guard-controller', 'run-tests.ts')
   };
 
-  private exampleTests: TestConfig = {
-    'workflow': resolve(__dirname, 'workflow', 'run-tests.ts')
-  };
+  private exampleTests: TestConfig = {};
 
   private results = {
     total: 0,
@@ -49,7 +47,6 @@ class SanitySDKTestRunner {
     console.log('  --secure-ownable         Run secure-ownable tests only');
     console.log('  --runtime-rbac           Run runtime-rbac tests only');
     console.log('  --guard-controller       Run guard-controller tests only');
-    console.log('  --workflow               Run workflow tests only');
     console.log('  --help                   Show this help message');
     console.log();
     console.log('Examples:');

scripts/sanity-sdk/runtime-rbac/base-test.ts

@@ -6,13 +6,14 @@
 import { Address, Hex } from 'viem';
 import { RuntimeRBAC } from '../../../sdk/typescript/contracts/core/RuntimeRBAC.tsx';
 import { BaseSDKTest, TestWallet } from '../base/BaseSDKTest.ts';
-import { getContractAddressFromArtifacts } from '../base/test-helpers.ts';
+import { getContractAddressFromArtifacts, getDefinitionAddress } from '../base/test-helpers.ts';
 import { getTestConfig } from '../base/test-config.ts';
 import { MetaTransactionSigner } from '../../../sdk/typescript/utils/metaTx/metaTransaction.tsx';
 import { MetaTransaction, MetaTxParams, TxParams } from '../../../sdk/typescript/interfaces/lib.index.tsx';
 import { TxAction } from '../../../sdk/typescript/types/lib.index.tsx';
 import { keccak256, toBytes } from 'viem';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
+import { roleConfigBatchExecutionParams } from '../../../sdk/typescript/lib/definitions/RuntimeRBACDefinitions';
 import AccountBloxABIJson from '../../../sdk/typescript/abi/AccountBlox.abi.json';
 
 export interface RuntimeRBACRoles {
@@ -54,6 +55,8 @@ export interface RoleConfigAction {
 
 export abstract class BaseRuntimeRBACTest extends BaseSDKTest {
   protected runtimeRBAC: RuntimeRBAC | null = null;
+  /** Deployed RuntimeRBACDefinitions library address (for execution params) */
+  protected runtimeRBACDefinitionsAddress: Address | null = null;
   protected roles: RuntimeRBACRoles = {
     owner: '0x' as Address,
     broadcaster: '0x' as Address,
@@ -109,6 +112,8 @@ export abstract class BaseRuntimeRBACTest extends BaseSDKTest {
       throw new Error('Contract address not set');
     }
 
+    this.runtimeRBACDefinitionsAddress = await getDefinitionAddress('RuntimeRBACDefinitions');
+
     // Create a wallet client for the owner (default)
     const walletClient = this.createWalletClient('wallet1');
 
@@ -378,8 +383,11 @@ export abstract class BaseRuntimeRBACTest extends BaseSDKTest {
       throw new Error(`Wallet not found: ${signerWalletName}`);
     }
 
-    // Create execution params
-    const executionParams = await this.runtimeRBAC.roleConfigBatchExecutionParams(actions);
+    // Create execution params (via definition contract)
+    if (!this.runtimeRBACDefinitionsAddress) {
+      throw new Error('RuntimeRBACDefinitions address not set');
+    }
+    const executionParams = await roleConfigBatchExecutionParams(this.publicClient, this.runtimeRBACDefinitionsAddress, actions);
 
     // Create meta-tx params
     const metaTxParams = await this.createMetaTxParams(

scripts/sanity-sdk/secure-ownable/base-test.ts

@@ -6,7 +6,7 @@
 import { Address, Hex } from 'viem';
 import { SecureOwnable } from '../../../sdk/typescript/contracts/core/SecureOwnable.tsx';
 import { BaseSDKTest, TestWallet } from '../base/BaseSDKTest.ts';
-import { getContractAddressFromArtifacts } from '../base/test-helpers.ts';
+import { getContractAddressFromArtifacts, getDefinitionAddress } from '../base/test-helpers.ts';
 import { getTestConfig } from '../base/test-config.ts';
 import { MetaTransactionSigner } from '../../../sdk/typescript/utils/metaTx/metaTransaction.tsx';
 import { MetaTransaction, MetaTxParams } from '../../../sdk/typescript/interfaces/lib.index.tsx';
@@ -21,6 +21,8 @@ export interface SecureOwnableRoles {
 
 export abstract class BaseSecureOwnableTest extends BaseSDKTest {
   protected secureOwnable: SecureOwnable | null = null;
+  /** Deployed SecureOwnableDefinitions library address (for execution params) */
+  protected secureOwnableDefinitionsAddress: Address | null = null;
   protected roles: SecureOwnableRoles = {
     owner: '0x' as Address,
     broadcaster: '0x' as Address,
@@ -59,6 +61,8 @@ export abstract class BaseSecureOwnableTest extends BaseSDKTest {
       throw new Error('Contract address not set');
     }
 
+    this.secureOwnableDefinitionsAddress = await getDefinitionAddress('SecureOwnableDefinitions');
+
     // Create a wallet client for the owner (default)
     const walletClient = this.createWalletClient('wallet1');
 

scripts/sanity-sdk/secure-ownable/recovery-update-tests.ts

@@ -7,6 +7,7 @@ import { Address, Hex } from 'viem';
 import { BaseSecureOwnableTest } from './base-test.ts';
 import { TxAction } from '../../../sdk/typescript/types/lib.index.tsx';
 import { FUNCTION_SELECTORS, OPERATION_TYPES } from '../../../sdk/typescript/types/core.access.index.tsx';
+import { updateRecoveryExecutionParams } from '../../../sdk/typescript/lib/definitions/SecureOwnableDefinitions';
 
 export class RecoveryUpdateTests extends BaseSecureOwnableTest {
   constructor() {
@@ -86,10 +87,13 @@ export class RecoveryUpdateTests extends BaseSecureOwnableTest {
         (k) => this.wallets[k].address.toLowerCase() === ownerWallet.address.toLowerCase()
       ) || 'wallet1';
 
-      // Get execution params for recovery update
+      // Get execution params for recovery update (via definition contract)
+      if (!this.secureOwnableDefinitionsAddress) {
+        throw new Error('SecureOwnableDefinitions address not set');
+      }
       let executionOptions: Hex;
       try {
-        const result = await this.secureOwnable.updateRecoveryExecutionParams(newRecoveryAddress);
+        const result = await updateRecoveryExecutionParams(this.publicClient, this.secureOwnableDefinitionsAddress, newRecoveryAddress);
         console.log(`    🔍 Raw execution params result:`, result, `(type: ${typeof result})`);
         executionOptions = result;
         this.assertTest(!!executionOptions && typeof executionOptions === 'string' && executionOptions.startsWith('0x'), 'Execution params created successfully');

scripts/sanity-sdk/secure-ownable/timelock-period-tests.ts

@@ -3,9 +3,11 @@
  * Tests updating the timelock period via meta-transaction
  */
 
+import { Hex } from 'viem';
 import { BaseSecureOwnableTest } from './base-test.ts';
 import { TxAction } from '../../../sdk/typescript/types/lib.index.tsx';
 import { FUNCTION_SELECTORS, OPERATION_TYPES } from '../../../sdk/typescript/types/core.access.index.tsx';
+import { updateTimeLockExecutionParams } from '../../../sdk/typescript/lib/definitions/SecureOwnableDefinitions';
 
 export class TimelockPeriodTests extends BaseSecureOwnableTest {
   constructor() {
@@ -85,10 +87,13 @@ export class TimelockPeriodTests extends BaseSecureOwnableTest {
         (k) => this.wallets[k].address.toLowerCase() === ownerWallet.address.toLowerCase()
       ) || 'wallet1';
 
-      // Get execution params for timelock update
+      // Get execution params for timelock update (via definition contract)
+      if (!this.secureOwnableDefinitionsAddress) {
+        throw new Error('SecureOwnableDefinitions address not set');
+      }
       let executionOptions: Hex;
       try {
-        executionOptions = await this.secureOwnable.updateTimeLockExecutionParams(newTimelockSeconds);
+        executionOptions = await updateTimeLockExecutionParams(this.publicClient, this.secureOwnableDefinitionsAddress, newTimelockSeconds);
         this.assertTest(!!executionOptions && typeof executionOptions === 'string' && executionOptions.startsWith('0x'), 'Execution params created successfully');
         console.log(`    ✅ Execution params created for ${description}`);
       } catch (error: any) {