chore: update sanity test configurations to use AccountBlox

This commit modifies the sanity test scripts and configuration files to standardize the use of the AccountBlox contract. The ACCOUNTBLOX_ADDRESS environment variable is now required for all sanity tests, replacing previous references to SecureBlox and RoleBlox. Additionally, the truffle-config has been updated to accept dynamic network IDs, enhancing compatibility with various development environments. Documentation has also been updated to reflect these changes.

Author: JaCoderX

env.example

@@ -28,6 +28,8 @@ REMOTE_FROM=
 
 
 # Contract Addresses (optional - can be provided at runtime)
+# Sanity tests (scripts/sanity and scripts/sanity-sdk) use only ACCOUNTBLOX_ADDRESS.
+ACCOUNTBLOX_ADDRESS=
 SECUREBLOX_ADDRESS=
 ROLEBLOX_ADDRESS=
 BAREBLOX_ADDRESS=

scripts/sanity-sdk/README.md

@@ -41,6 +41,10 @@ npx tsx --tsconfig scripts/sanity-sdk/tsconfig.json scripts/sanity-sdk/run-all-t
 ### Example Tests (Optional)
 - **workflow**: Workflow integration tests
 
+## Contract Configuration
+
+All sanity tests use a **single account contract** (AccountBlox). Set `ACCOUNTBLOX_ADDRESS` in `.env` for manual mode; in auto mode the address is read from Truffle artifacts.
+
 ## Individual Test Suites
 
 Each test suite can also be run individually:

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

@@ -17,8 +17,13 @@ export interface TestConfig {
   rpcUrl: string;
   chainId: number;
   contractAddresses: {
+    /** Single account contract used for all sanity tests (SecureOwnable, RuntimeRBAC, GuardController) */
+    accountBlox?: string;
+    /** @deprecated Use accountBlox (same as ACCOUNTBLOX_ADDRESS) */
     secureBlox?: string;
+    /** @deprecated Use accountBlox (same as ACCOUNTBLOX_ADDRESS) */
     runtimeRBAC?: string;
+    /** @deprecated Use accountBlox (same as ACCOUNTBLOX_ADDRESS) */
     guardController?: string;
   };
   privateKeys: {
@@ -73,9 +78,10 @@ export function getTestConfig(): TestConfig {
     rpcUrl: getRPCUrl(),
     chainId: getChainId(),
     contractAddresses: {
-      secureBlox: process.env.SECUREBLOX_ADDRESS,
-      runtimeRBAC: process.env.RUNTIMERBAC_ADDRESS,
-      guardController: process.env.GUARDCONTROLLER_ADDRESS,
+      accountBlox: process.env.ACCOUNTBLOX_ADDRESS,
+      secureBlox: process.env.ACCOUNTBLOX_ADDRESS,
+      runtimeRBAC: process.env.ACCOUNTBLOX_ADDRESS,
+      guardController: process.env.ACCOUNTBLOX_ADDRESS,
     },
     privateKeys: {
       wallet1: process.env.TEST_WALLET_1_PRIVATE_KEY,

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

@@ -52,13 +52,12 @@ export abstract class BaseGuardControllerTest extends BaseSDKTest {
   }
 
   /**
-   * Get contract address from environment
+   * Get contract address from environment (single account contract)
    */
   protected getContractAddressFromEnv(): Address | null {
-    const address = getTestConfig().contractAddresses.guardController || 
-                    process.env.ACCOUNTBLOX_ADDRESS;
+    const address = getTestConfig().contractAddresses.accountBlox;
     if (!address) {
-      throw new Error('GUARDCONTROLLER_ADDRESS or ACCOUNTBLOX_ADDRESS not set in environment variables');
+      throw new Error('ACCOUNTBLOX_ADDRESS not set in environment variables');
     }
     return address as Address;
   }

scripts/sanity-sdk/guard-controller/erc20-mint-controller-tests.ts

@@ -209,8 +209,13 @@ export class Erc20MintControllerSdkTests extends BaseGuardControllerTest {
         ) || 'wallet2'
       );
 
-      // Check if already whitelisted
-      const targets = await this.guardController.getFunctionWhitelistTargets(ERC20_MINT_SELECTOR);
+      // Check if already whitelisted (contract may revert if selector not yet registered)
+      let targets: Address[] = [];
+      try {
+        targets = await this.guardController.getFunctionWhitelistTargets(ERC20_MINT_SELECTOR);
+      } catch (_) {
+        console.log('  ℹ️  getFunctionWhitelistTargets reverted (selector may be unregistered); treating as empty');
+      }
       const already = targets.some((t) => t.toLowerCase() === token.toLowerCase());
       if (already) {
         console.log('  ℹ️  BasicERC20 already whitelisted for mint; skipping add');
@@ -238,7 +243,12 @@ export class Erc20MintControllerSdkTests extends BaseGuardControllerTest {
       const isSuccess1 = status1 === 'success' || status1 === 1 || String(status1) === '1';
       console.log(`     Status: ${isSuccess1 ? 'SUCCESS' : 'FAILED'}`);
 
-      const targetsAfter = await this.guardController.getFunctionWhitelistTargets(ERC20_MINT_SELECTOR);
+      let targetsAfter: Address[] = [];
+      try {
+        targetsAfter = await this.guardController.getFunctionWhitelistTargets(ERC20_MINT_SELECTOR);
+      } catch (_) {
+        console.log('  ℹ️  getFunctionWhitelistTargets reverted after update (best-effort check skipped)');
+      }
       console.log(`  📋 Whitelist targets after SDK update (${targetsAfter.length}):`);
       targetsAfter.forEach((t, i) => {
         console.log(`     ${i + 1}. ${t}`);

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

@@ -13,7 +13,7 @@ import { MetaTransaction, MetaTxParams, TxParams } from '../../../sdk/typescript
 import { TxAction } from '../../../sdk/typescript/types/lib.index.tsx';
 import { keccak256, toBytes } from 'viem';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
-import RoleBloxABIJson from '../../../sdk/typescript/abi/RoleBlox.abi.json';
+import AccountBloxABIJson from '../../../sdk/typescript/abi/AccountBlox.abi.json';
 
 export interface RuntimeRBACRoles {
   owner: Address;
@@ -83,26 +83,26 @@ export abstract class BaseRuntimeRBACTest extends BaseSDKTest {
   }
 
   /**
-   * Get contract address from artifacts
+   * Get contract address from artifacts (AccountBlox is the single account contract)
    */
   protected async getContractAddress(): Promise<Address | null> {
-    return getContractAddressFromArtifacts('RoleBlox');
+    return getContractAddressFromArtifacts('AccountBlox');
   }
 
   /**
    * Get contract address from environment
    */
   protected getContractAddressFromEnv(): Address | null {
-    const address = getTestConfig().contractAddresses.runtimeRBAC;
+    const address = getTestConfig().contractAddresses.accountBlox;
     if (!address) {
-      throw new Error('RUNTIMERBAC_ADDRESS or ROLEBLOX_ADDRESS not set in environment variables');
+      throw new Error('ACCOUNTBLOX_ADDRESS not set in environment variables');
     }
     return address as Address;
   }
 
   /**
    * Initialize RuntimeRBAC SDK instance
-   * Note: We use RuntimeRBAC SDK but need to access RoleBlox ABI functions
+   * AccountBlox implements RuntimeRBAC; we use AccountBlox ABI for full function coverage.
    */
   protected async initializeSDK(): Promise<void> {
     if (!this.contractAddress) {
@@ -119,10 +119,10 @@ export abstract class BaseRuntimeRBACTest extends BaseSDKTest {
       this.chain
     );
 
-    // Override the ABI to use RoleBlox ABI which includes all functions
-    (this.runtimeRBAC as any).abi = RoleBloxABIJson;
+    // Override the ABI to use AccountBlox ABI which includes all RuntimeRBAC + GuardController + SecureOwnable functions
+    (this.runtimeRBAC as any).abi = AccountBloxABIJson;
 
-    console.log('✅ RuntimeRBAC SDK initialized');
+    console.log('✅ RuntimeRBAC SDK initialized (AccountBlox)');
   }
 
   /**

scripts/sanity-sdk/runtime-rbac/rbac-tests.ts

@@ -202,13 +202,30 @@ export class RuntimeRBACTests extends BaseRuntimeRBACTest {
       console.log('  ✅ Step 1 completed successfully');
     } catch (error: any) {
       // Check if role was created despite error (unclean start)
-      const roleExistsAfter = await this.roleExists(this.registryAdminRoleHash!);
+      let roleExistsAfter = false;
+      try {
+        roleExistsAfter = await this.roleExists(this.registryAdminRoleHash!);
+      } catch (_) {
+        // roleExists can fail on RPC/contract errors; treat as unknown
+      }
       if (roleExistsAfter) {
         console.log(`  ⚠️  Role was created despite error, verifying permissions...`);
         await this.ensureRoleHasRequiredPermissions(this.registryAdminRoleHash!);
         console.log('  ✅ Step 1 completed (role already existed)');
         return;
       }
+      // Create may have reverted with ResourceAlreadyExists (simulation failed before tx sent)
+      const msg = error?.message ?? '';
+      if (msg.includes('ResourceAlreadyExists') || msg.includes('revert') || msg.includes('Missing or invalid')) {
+        console.log(`  ⏭️  Create reverted (${msg.slice(0, 60)}...); assuming role exists, verifying permissions...`);
+        try {
+          await this.ensureRoleHasRequiredPermissions(this.registryAdminRoleHash!);
+          console.log('  ✅ Step 1 completed (role already existed, permissions verified)');
+          return;
+        } catch (permErr: any) {
+          console.log(`  ⚠️  Permission verification failed: ${permErr.message}`);
+        }
+      }
       throw error;
     }
   }

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

@@ -34,19 +34,19 @@ export abstract class BaseSecureOwnableTest extends BaseSDKTest {
   }
 
   /**
-   * Get contract address from artifacts
+   * Get contract address from artifacts (AccountBlox is the single account contract)
    */
   protected async getContractAddress(): Promise<Address | null> {
-    return getContractAddressFromArtifacts('SecureBlox');
+    return getContractAddressFromArtifacts('AccountBlox');
   }
 
   /**
    * Get contract address from environment
    */
   protected getContractAddressFromEnv(): Address | null {
-    const address = getTestConfig().contractAddresses.secureBlox;
+    const address = getTestConfig().contractAddresses.accountBlox;
     if (!address) {
-      throw new Error('SECUREBLOX_ADDRESS not set in environment variables');
+      throw new Error('ACCOUNTBLOX_ADDRESS not set in environment variables');
     }
     return address as Address;
   }

scripts/sanity/README.md

@@ -43,6 +43,10 @@ node scripts/sanity/run-all-tests.cjs --simple-rwa20
 - **simple-vault**: Vault withdrawal and deposit tests
 - **simple-rwa20**: Token minting and burning tests
 
+## Contract Configuration
+
+All sanity tests use a **single account contract** (AccountBlox). In manual mode set `ACCOUNTBLOX_ADDRESS` in `.env`. In auto mode, the address is read from Truffle artifacts (AccountBlox). SecureBlox and RoleBlox are no longer used by sanity tests.
+
 ## Individual Test Suites
 
 Each test suite can also be run individually:

scripts/sanity/guard-controller/base-test.cjs

@@ -242,10 +242,10 @@ class BaseGuardControllerTest {
 
         try {
             // Get contract address from environment
-            this.contractAddress = process.env.ACCOUNTBLOX_ADDRESS || process.env.GUARD_CONTROLLER_ADDRESS;
+            this.contractAddress = process.env.ACCOUNTBLOX_ADDRESS;
 
             if (!this.contractAddress) {
-                throw new Error('ACCOUNTBLOX_ADDRESS or GUARD_CONTROLLER_ADDRESS not set in environment variables');
+                throw new Error('ACCOUNTBLOX_ADDRESS not set in environment variables');
             }
 
             console.log(`📋 Contract Address: ${this.contractAddress}`);