Work

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",

contracts/core/execution/lib/definitions/GuardControllerDefinitions.sol

@@ -35,8 +35,11 @@ library GuardControllerDefinitions {
     bytes32 public constant CONTROLLER_OPERATION = keccak256("CONTROLLER_OPERATION");
 
     // Function Selector Constants
-    // GuardController: executeWithTimeLock(address,bytes4,bytes,uint256,bytes32)
-    bytes4 public constant EXECUTE_WITH_TIMELOCK_SELECTOR = bytes4(keccak256("executeWithTimeLock(address,bytes4,bytes,uint256,bytes32)"));
+    // GuardController: executeWithTimeLock(address,uint256,bytes4,bytes,uint256,bytes32)
+    bytes4 public constant EXECUTE_WITH_TIMELOCK_SELECTOR = bytes4(keccak256("executeWithTimeLock(address,uint256,bytes4,bytes,uint256,bytes32)"));
+
+    // GuardController: executeWithPayment(address,uint256,bytes4,bytes,uint256,bytes32,(address,uint256,address,uint256))
+    bytes4 public constant EXECUTE_WITH_PAYMENT_SELECTOR = bytes4(keccak256("executeWithPayment(address,uint256,bytes4,bytes,uint256,bytes32,(address,uint256,address,uint256))"));
 
     // GuardController: approveTimeLockExecution(uint256)
     bytes4 public constant APPROVE_TIMELOCK_EXECUTION_SELECTOR = bytes4(keccak256("approveTimeLockExecution(uint256)"));
@@ -135,7 +138,7 @@ library GuardControllerDefinitions {
 
         // Schema 0: GuardController.executeWithTimeLock
         schemas[0] = EngineBlox.FunctionSchema({
-            functionSignature: "executeWithTimeLock(address,bytes4,bytes,uint256,bytes32)",
+            functionSignature: "executeWithTimeLock(address,uint256,bytes4,bytes,uint256,bytes32)",
             functionSelector: EXECUTE_WITH_TIMELOCK_SELECTOR,
             operationType: CONTROLLER_OPERATION,
             operationName: "CONTROLLER_OPERATION",

env.deployment.example

@@ -26,6 +26,21 @@ DEPLOY_NETWORK_NAME=sepolia
 # NEVER commit this file with a real key. Use .env.deployment (gitignored).
 DEPLOY_PRIVATE_KEY=your_deployer_private_key_here
 
+# -----------------------------------------------------------------------------
+# Default Blox initializers (used when deploying a new blox)
+# -----------------------------------------------------------------------------
+# Owner of the blox (admin authority)
+BLOX_OWNER_ADDRESS=0x_your_owner_address
+# Recovery address (e.g. key recovery, emergency)
+BLOX_RECOVERY_ADDRESS=0x_your_recovery_address
+# Broadcaster address (allowed to submit / broadcast operations)
+BLOX_BROADCASTER_ADDRESS=0x_your_broadcaster_address
+# Timelock delay in seconds (≥ 86400 for BloxchainWallet; 1 day = 86400; 1 sec min)
+BLOX_TIMELOCK_SECONDS=86400
+
+# Event forwarder for blox instances (default: FactoryBlox address or zero)
+# BLOX_EVENT_FORWARDER=0x...
+
 # -----------------------------------------------------------------------------
 # Optional: Gas / block settings
 # -----------------------------------------------------------------------------

hardhat.config.ts

@@ -15,12 +15,19 @@ import { defineConfig, type HardhatUserConfig } from "hardhat/config";
 
 const require = createRequire(import.meta.url);
 let hardhatToolboxViem: NonNullable<HardhatUserConfig["plugins"]>[number] | null = null;
+let hardhatEthers: NonNullable<HardhatUserConfig["plugins"]>[number] | null = null;
 try {
   const m = require("@nomicfoundation/hardhat-toolbox-viem");
   hardhatToolboxViem = (m?.default !== undefined ? m.default : m) as NonNullable<HardhatUserConfig["plugins"]>[number];
 } catch {
   // Toolbox not installed; install with: npm install --save-dev @nomicfoundation/hardhat-toolbox-viem
 }
+try {
+  const m = require("@nomicfoundation/hardhat-ethers");
+  hardhatEthers = (m?.default !== undefined ? m.default : m) as NonNullable<HardhatUserConfig["plugins"]>[number];
+} catch {
+  // For blox deploy with library linking: npm install --save-dev @nomicfoundation/hardhat-ethers ethers
+}
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 loadDeploymentEnv({ path: path.join(__dirname, ".env.deployment") });
@@ -42,7 +49,7 @@ const OPTIMIZER_RUNS = 200;
 const EVM_VERSION = "osaka";
 
 export default defineConfig({
-  plugins: hardhatToolboxViem ? [hardhatToolboxViem] : [],
+  plugins: [hardhatToolboxViem, hardhatEthers].filter(Boolean) as HardhatUserConfig["plugins"],
   paths: {
     sources: "./contracts",
     tests: "./test",

package.json

@@ -66,6 +66,7 @@
   "devDependencies": {
     "@commitlint/cli": "^20.3.1",
     "@commitlint/config-conventional": "^20.3.1",
+    "@nomicfoundation/hardhat-ethers": "^4.0.4",
     "dotenv": "^17.2.3",
     "hardhat": "^3.1.5",
     "husky": "^9.1.7",