Merge pull request #70 from PracticalParticle/work

Work

Author: JaCoderX

.gitignore

@@ -19,6 +19,7 @@ reports/
 
 ### Environment Variables ###
 *.env
+*.env.deployment
 
 ### Test Reports ###
 scripts/sanity/reports/
@@ -58,6 +59,8 @@ deployed-addresses.json
 # Copied by package/scripts/prepublish-contracts.cjs for @bloxchain/contracts
 package/abi/
 package/core/
+package/standards/
+package/components/
 
 # Build output for @bloxchain/sdk
 sdk/typescript/dist/

README.md

@@ -215,10 +215,10 @@ Deployed addresses are written to **`deployed-addresses.json`** under the networ
 
 | Contract | Address |
 |----------|---------|
-| EngineBlox | [`0x5f91de8521fd0f5ca8b709e7f04d5c57dbcba4e1`](https://sepolia.etherscan.io/address/0x5f91de8521fd0f5ca8b709e7f04d5c57dbcba4e1) |
-| SecureOwnableDefinitions | [`0xdca4830d74b66093e29bb080d92f837b944b4001`](https://sepolia.etherscan.io/address/0xdca4830d74b66093e29bb080d92f837b944b4001) |
-| RuntimeRBACDefinitions | [`0x7b964d1878664a61ed9eec90b8354f7df307ff21`](https://sepolia.etherscan.io/address/0x7b964d1878664a61ed9eec90b8354f7df307ff21) |
-| GuardControllerDefinitions | [`0x7a5361a3b2ace07982813f0bfc3a0a684d4ea0fe`](https://sepolia.etherscan.io/address/0x7a5361a3b2ace07982813f0bfc3a0a684d4ea0fe) |
+| EngineBlox | [`0x524632c2a77b27a11f536f4e568570dc2aaafe99`](https://sepolia.etherscan.io/address/0x524632c2a77b27a11f536f4e568570dc2aaafe99) |
+| SecureOwnableDefinitions | [`0x0b722d1bad16e449482d69a13c42373a9d8ce2cf`](https://sepolia.etherscan.io/address/0x0b722d1bad16e449482d69a13c42373a9d8ce2cf) |
+| RuntimeRBACDefinitions | [`0x5c64e07d6193475b7869b33cef00fbae1ec27938`](https://sepolia.etherscan.io/address/0x5c64e07d6193475b7869b33cef00fbae1ec27938) |
+| GuardControllerDefinitions | [`0xcd56a07a1285c5a6cc070d17a63b5a31e151de0e`](https://sepolia.etherscan.io/address/0xcd56a07a1285c5a6cc070d17a63b5a31e151de0e) |
 
 
 ## 📖 Usage Examples

contracts/standards/behavior/ICopyable.sol

@@ -33,10 +33,4 @@ interface ICopyable {
         address eventForwarder,
         bytes calldata initData
     ) external;
-
-    /**
-     * @dev Initialize or set clone-specific data (e.g. after a minimal proxy is deployed).
-     * @param initData Custom data for this clone; semantics are defined by the implementer
-     */
-    function setCloneData(bytes calldata initData) external;
 }

env.example

@@ -66,6 +66,8 @@ DEPLOY_ACCOUNTBLOX=false
 DEPLOY_SIMPLE_VAULT=false
 DEPLOY_SIMPLE_RWA20=false
 DEPLOY_ERC20_BLOX=false
+DEPLOY_FACTORY_BLOX=false
+DEPLOY_WALLET_BLOX=false
 
 # Definition Library Addresses (per network)
 # These are the addresses of the deployed definition libraries
@@ -84,6 +86,8 @@ RUNTIME_RBAC_DEFINITIONS_ADDRESS=
 #   DEPLOY_SIMPLE_VAULT=true/false     - Deploy SimpleVault example contract
 #   DEPLOY_SIMPLE_RWA20=true/false      - Deploy SimpleRWA20 example contract
 #   DEPLOY_ERC20_BLOX=true/false        - Deploy ERC20Blox example contract
+#   DEPLOY_FACTORY_BLOX=true/false      - Deploy FactoryBlox (clone factory) example contract
+#   DEPLOY_WALLET_BLOX=true/false       - Deploy BloxchainWallet (Account + ICopyable) example contract
 #
 # DEPLOYMENT SCENARIOS:
 #   🏗️  Full Development: All core flags=true, Example flags=false
@@ -96,6 +100,8 @@ RUNTIME_RBAC_DEFINITIONS_ADDRESS=
 #   🏦 SimpleVault: Example vault contract with Bloxchain integration
 #   🏦 SimpleRWA20: Example RWA token contract with Bloxchain integration
 #   🏦 ERC20Blox: Example ERC20 token with SecureOwnable, RuntimeRBAC, GuardController
+#   🏭 FactoryBlox: Clone factory with RBAC and GuardController (cloneBlox, whitelist)
+#   👛 BloxchainWallet: Official wallet controller (Account, ICopyable, 1–90 day timelock)
 #
 # =============================================================================
 # TEST MODE USAGE GUIDE
@@ -123,7 +129,7 @@ RUNTIME_RBAC_DEFINITIONS_ADDRESS=
 #
 # DEPLOYMENT EXAMPLES:
 #   Deploy only examples:
-#     DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=true truffle migrate
+#     DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=true DEPLOY_FACTORY_BLOX=true DEPLOY_WALLET_BLOX=true truffle migrate
 #
 #   Deploy everything (full development):
 #     All flags=true truffle migrate

foundry.toml

@@ -5,10 +5,10 @@ libs = ["node_modules", "lib"]
 test = "test/foundry"
 cache_path = "cache_forge"
 
-# Solidity compiler settings - matching Truffle config for consistency
+# Solidity compiler settings
 solc = "0.8.33"
 optimizer = true
-optimizer_runs = 200  # Changed from 200 to match Truffle (faster compilation)
+optimizer_runs = 200
 via_ir = true
 evm_version = "osaka"
 

migrations/3_deploy_example_contracts.cjs

@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: MPL-2.0
-// Migration 3: Deploy Example Contracts (SimpleVault, SimpleRWA20, ERC20Blox)
+// Migration 3: Deploy Example Contracts (SimpleVault, SimpleRWA20, ERC20Blox, FactoryBlox, BloxchainWallet)
 
 const SimpleVault = artifacts.require("SimpleVault");
 const SimpleRWA20 = artifacts.require("SimpleRWA20");
 const ERC20Blox = artifacts.require("ERC20Blox");
+const FactoryBlox = artifacts.require("FactoryBlox");
+const BloxchainWallet = artifacts.require("BloxchainWallet");
 
 // Import the deployed library artifacts to get their addresses
 const EngineBlox = artifacts.require("EngineBlox");
@@ -15,6 +17,7 @@ const GuardControllerDefinitions = artifacts.require("GuardControllerDefinitions
 const SimpleVaultDefinitions = artifacts.require("SimpleVaultDefinitions");
 const SimpleRWA20Definitions = artifacts.require("SimpleRWA20Definitions");
 const ERC20BloxDefinitions = artifacts.require("ERC20BloxDefinitions");
+const FactoryBloxDefinitions = artifacts.require("FactoryBloxDefinitions");
 const { saveArtifactNetwork } = require('./helpers/save-artifact-network.cjs');
 
 module.exports = async function(deployer, network, accounts) {
@@ -28,41 +31,53 @@ module.exports = async function(deployer, network, accounts) {
   const deploySimpleVault = process.env.DEPLOY_SIMPLE_VAULT === 'true'; // Default: false
   const deploySimpleRWA20 = process.env.DEPLOY_SIMPLE_RWA20 === 'true'; // Default: false
   const deployERC20Blox = process.env.DEPLOY_ERC20_BLOX === 'true'; // Default: false
-  
+  const deployFactoryBlox = process.env.DEPLOY_FACTORY_BLOX === 'true'; // Default: false
+  const deployWalletBlox = process.env.DEPLOY_WALLET_BLOX === 'true'; // Default: false
+
   console.log("\n🎯 Deployment Configuration:");
   console.log(`   SimpleVault: ${deploySimpleVault ? '✅ YES' : '❌ NO'}`);
   console.log(`   SimpleRWA20: ${deploySimpleRWA20 ? '✅ YES' : '❌ NO'}`);
   console.log(`   ERC20Blox: ${deployERC20Blox ? '✅ YES' : '❌ NO'}`);
+  console.log(`   FactoryBlox: ${deployFactoryBlox ? '✅ YES' : '❌ NO'}`);
+  console.log(`   BloxchainWallet: ${deployWalletBlox ? '✅ YES' : '❌ NO'}`);
 
   try {
     // Step 1: Deploy Example-Specific Definitions Libraries (only if needed)
     let simpleVaultDefinitions = null;
     let simpleRWA20Definitions = null;
     let erc20BloxDefinitions = null;
-    
-    if (deploySimpleVault || deploySimpleRWA20 || deployERC20Blox) {
+    let factoryBloxDefinitions = null;
+
+    if (deploySimpleVault || deploySimpleRWA20 || deployERC20Blox || deployFactoryBlox || deployWalletBlox) {
         console.log("\n📦 Step 1: Deploying Example-Specific Definitions Libraries...");
-        
+
         if (deploySimpleVault) {
             // Deploy SimpleVaultDefinitions
             await deployer.deploy(SimpleVaultDefinitions);
             simpleVaultDefinitions = await SimpleVaultDefinitions.deployed();
             console.log(`✅ SimpleVaultDefinitions deployed at: ${simpleVaultDefinitions.address}`);
         }
-        
+
         if (deploySimpleRWA20) {
             // Deploy SimpleRWA20Definitions
             await deployer.deploy(SimpleRWA20Definitions);
             simpleRWA20Definitions = await SimpleRWA20Definitions.deployed();
             console.log(`✅ SimpleRWA20Definitions deployed at: ${simpleRWA20Definitions.address}`);
         }
-        
+
         if (deployERC20Blox) {
             // Deploy ERC20BloxDefinitions
             await deployer.deploy(ERC20BloxDefinitions);
             erc20BloxDefinitions = await ERC20BloxDefinitions.deployed();
             console.log(`✅ ERC20BloxDefinitions deployed at: ${erc20BloxDefinitions.address}`);
         }
+
+        if (deployFactoryBlox) {
+            // Deploy FactoryBloxDefinitions
+            await deployer.deploy(FactoryBloxDefinitions);
+            factoryBloxDefinitions = await FactoryBloxDefinitions.deployed();
+            console.log(`✅ FactoryBloxDefinitions deployed at: ${factoryBloxDefinitions.address}`);
+        }
     } else {
         console.log("\n📦 Step 1: Skipping Example-Specific Definitions Libraries (no contracts enabled)");
     }
@@ -255,11 +270,81 @@ module.exports = async function(deployer, network, accounts) {
         console.log("\n📦 Step 5: Skipping ERC20Blox deployment (disabled)");
     }
 
+    // Step 6: Deploy FactoryBlox (if enabled)
+    let factoryBlox = null;
+    if (deployFactoryBlox) {
+        console.log("\n📦 Step 6: Deploying FactoryBlox...");
+        await deployer.link(sa, FactoryBlox);
+        await deployer.link(sod, FactoryBlox);
+        await deployer.link(drbd, FactoryBlox);
+        await deployer.link(gcd, FactoryBlox);
+        await deployer.link(factoryBloxDefinitions, FactoryBlox);
+        await deployer.deploy(FactoryBlox);
+        factoryBlox = await FactoryBlox.deployed();
+        console.log(`✅ FactoryBlox deployed at: ${factoryBlox.address}`);
+        const web3Factory = factoryBlox.constructor.web3 || global.web3;
+        await saveArtifactNetwork(FactoryBlox, factoryBlox.address, web3Factory, network);
+
+        // Initialize FactoryBlox (5 params)
+        console.log("🔧 Initializing FactoryBlox...");
+        try {
+            await factoryBlox.initialize(
+                accounts[0],  // initialOwner
+                accounts[1],  // broadcaster
+                accounts[2],  // recovery
+                1,            // timeLockPeriodInSeconds (1 second for fast testing)
+                "0x0000000000000000000000000000000000000000"  // eventForwarder (none)
+            );
+            console.log("✅ FactoryBlox initialized successfully");
+        } catch (error) {
+            console.log("❌ FactoryBlox initialize failed:", error.message);
+            console.log("⚠️  Contract deployed but not initialized.");
+        }
+    } else {
+        console.log("\n📦 Step 6: Skipping FactoryBlox deployment (disabled)");
+    }
+
+    // Step 7: Deploy BloxchainWallet (if enabled) - Account-based, no definitions library; timeLock 1–90 days
+    const ONE_DAY_SEC = 86400;
+    let bloxchainWallet = null;
+    if (deployWalletBlox) {
+        console.log("\n📦 Step 7: Deploying BloxchainWallet...");
+        await deployer.link(sa, BloxchainWallet);
+        await deployer.link(sod, BloxchainWallet);
+        await deployer.link(drbd, BloxchainWallet);
+        await deployer.link(gcd, BloxchainWallet);
+        await deployer.deploy(BloxchainWallet);
+        bloxchainWallet = await BloxchainWallet.deployed();
+        console.log(`✅ BloxchainWallet deployed at: ${bloxchainWallet.address}`);
+        const web3Wallet = bloxchainWallet.constructor.web3 || global.web3;
+        await saveArtifactNetwork(BloxchainWallet, bloxchainWallet.address, web3Wallet, network);
+
+        // Initialize BloxchainWallet (5 params); timeLock must be between 1 and 90 days
+        console.log("🔧 Initializing BloxchainWallet...");
+        try {
+            await bloxchainWallet.initialize(
+                accounts[0],  // initialOwner
+                accounts[1],  // broadcaster
+                accounts[2],  // recovery
+                ONE_DAY_SEC,  // timeLockPeriodInSeconds (min 1 day per contract)
+                "0x0000000000000000000000000000000000000000"  // eventForwarder (none)
+            );
+            console.log("✅ BloxchainWallet initialized successfully");
+        } catch (error) {
+            console.log("❌ BloxchainWallet initialize failed:", error.message);
+            console.log("⚠️  Contract deployed but not initialized.");
+        }
+    } else {
+        console.log("\n📦 Step 7: Skipping BloxchainWallet deployment (disabled)");
+    }
+
     console.log("\n🎉 Migration 3 completed successfully!");
     console.log("📋 Example Contracts Deployed & Initialized:");
     if (simpleVault) console.log(`   SimpleVault: ${simpleVault.address}`);
     if (simpleRWA20) console.log(`   SimpleRWA20: ${simpleRWA20.address}`);
     if (erc20Blox) console.log(`   ERC20Blox: ${erc20Blox.address}`);
+    if (factoryBlox) console.log(`   FactoryBlox: ${factoryBlox.address}`);
+    if (bloxchainWallet) console.log(`   BloxchainWallet: ${bloxchainWallet.address}`);
 
     // Save deployed addresses to file for auto mode fallback
     const fs = require('fs');
@@ -293,6 +378,12 @@ module.exports = async function(deployer, network, accounts) {
             deployedAt: new Date().toISOString()
         };
     }
+    if (factoryBloxDefinitions) {
+        addresses[network].FactoryBloxDefinitions = {
+            address: factoryBloxDefinitions.address,
+            deployedAt: new Date().toISOString()
+        };
+    }
     if (simpleVault) {
         addresses[network].SimpleVault = {
             address: simpleVault.address,
@@ -311,7 +402,19 @@ module.exports = async function(deployer, network, accounts) {
             deployedAt: new Date().toISOString()
         };
     }
-    
+    if (factoryBlox) {
+        addresses[network].FactoryBlox = {
+            address: factoryBlox.address,
+            deployedAt: new Date().toISOString()
+        };
+    }
+    if (bloxchainWallet) {
+        addresses[network].BloxchainWallet = {
+            address: bloxchainWallet.address,
+            deployedAt: new Date().toISOString()
+        };
+    }
+
     fs.writeFileSync(addressesFile, JSON.stringify(addresses, null, 2));
     console.log(`\n💾 Saved addresses to ${addressesFile}`);
 
@@ -325,13 +428,16 @@ module.exports = async function(deployer, network, accounts) {
     if (simpleVaultDefinitions) console.log(`   SimpleVaultDefinitions: ${simpleVaultDefinitions.address}`);
     if (simpleRWA20Definitions) console.log(`   SimpleRWA20Definitions: ${simpleRWA20Definitions.address}`);
     if (erc20BloxDefinitions) console.log(`   ERC20BloxDefinitions: ${erc20BloxDefinitions.address}`);
+    if (factoryBloxDefinitions) console.log(`   FactoryBloxDefinitions: ${factoryBloxDefinitions.address}`);
     console.log("🛡️ Guardian Contracts (Deployed & Initialized):");
     console.log(`   GuardianAccountAbstraction: 0xf759A0e8F2fFBb5F5a9DD50f1106668FBE29bC93`);
     console.log(`   GuardianAccountAbstractionWithRoles: 0xA5682DF1987D214Fe4dfC3a262179eBDc205b525`);
     console.log("🏦 Example Contracts (Deployed & Initialized):");
     if (simpleVault) console.log(`   SimpleVault: ${simpleVault.address}`);
     if (simpleRWA20) console.log(`   SimpleRWA20: ${simpleRWA20.address}`);
     if (erc20Blox) console.log(`   ERC20Blox: ${erc20Blox.address}`);
+    if (factoryBlox) console.log(`   FactoryBlox: ${factoryBlox.address}`);
+    if (bloxchainWallet) console.log(`   BloxchainWallet: ${bloxchainWallet.address}`);
     console.log("\n✅ All contracts deployed and initialized successfully!");
     console.log("🎯 Ready for comprehensive analyzer testing with fully functional contracts!");
     console.log("🔧 Initialization Parameters:");
@@ -344,10 +450,12 @@ module.exports = async function(deployer, network, accounts) {
     console.log(`   Token Symbol: SRWA`);
 
     console.log("\n💡 Usage Examples:");
-    console.log("   Deploy only SimpleVault: DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=false truffle migrate");
-    console.log("   Deploy only SimpleRWA20: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=false truffle migrate");
-    console.log("   Deploy only ERC20Blox: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=true truffle migrate");
-    console.log("   Deploy all example contracts: DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=true truffle migrate");
+    console.log("   Deploy only SimpleVault: DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=false DEPLOY_FACTORY_BLOX=false DEPLOY_WALLET_BLOX=false truffle migrate");
+    console.log("   Deploy only SimpleRWA20: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=false DEPLOY_FACTORY_BLOX=false DEPLOY_WALLET_BLOX=false truffle migrate");
+    console.log("   Deploy only ERC20Blox: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=true DEPLOY_FACTORY_BLOX=false DEPLOY_WALLET_BLOX=false truffle migrate");
+    console.log("   Deploy only FactoryBlox: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=false DEPLOY_FACTORY_BLOX=true DEPLOY_WALLET_BLOX=false truffle migrate");
+    console.log("   Deploy only BloxchainWallet: DEPLOY_SIMPLE_VAULT=false DEPLOY_SIMPLE_RWA20=false DEPLOY_ERC20_BLOX=false DEPLOY_FACTORY_BLOX=false DEPLOY_WALLET_BLOX=true truffle migrate");
+    console.log("   Deploy all example contracts: DEPLOY_SIMPLE_VAULT=true DEPLOY_SIMPLE_RWA20=true DEPLOY_ERC20_BLOX=true DEPLOY_FACTORY_BLOX=true DEPLOY_WALLET_BLOX=true truffle migrate");
     console.log("   Deploy none (default): truffle migrate");
 
   } catch (error) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Bloxchain",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "description": "Library engine for building enterprise grade decentralized permissioned applications",
   "type": "module",
   "main": "truffle-config.cjs",
@@ -41,14 +41,14 @@
     "test:packages": "node scripts/test-packages.cjs",
     "extract-abi": "node scripts/extract-abi.cjs",
     "release:sync-versions": "node scripts/sync-versions.cjs",
-    "release:sync-versions:tag:alpha": "node scripts/sync-versions.cjs --tag alpha.7",
+    "release:sync-versions:tag:alpha": "node scripts/sync-versions.cjs --tag alpha.8",
     "build:sdk": "cd sdk/typescript && npm run build",
     "build:sdk:clean": "cd sdk/typescript && npm run clean && npm run build",
     "prepublish:sdk": "npm run release:sync-versions && npm run extract-abi && npm run build:sdk",
     "prepublish:contracts": "npm run release:sync-versions",
     "generate:contracts-lock": "cd package && npm install --package-lock-only",
-    "publish:contracts": "npm run prepublish:contracts && cd package && npm publish --tag alpha.7",
-    "publish:sdk": "npm run prepublish:sdk && cd sdk/typescript && npm publish --tag alpha.7",
+    "publish:contracts": "npm run prepublish:contracts && cd package && npm publish --tag alpha.8",
+    "publish:sdk": "npm run prepublish:sdk && cd sdk/typescript && npm publish --tag alpha.8",
     "docgen": "npm run compile:hardhat && cd docgen && npm run docgen",
     "docgen:install": "cd docgen && npm install",
     "format": "prettier --config .prettierrc --write \"contracts/**/*.sol\"",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloxchain/contracts",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "description": "Library engine for building enterprise grade decentralized permissioned applications",
   "files": [
     "core",

package/package.json

@@ -36,7 +36,8 @@ async function main() {
   if (!hasViem && !hasEthers) {
     throw new Error(
       "Deployment requires either Hardhat viem (conn.viem) or ethers (conn.ethers with getSigners). " +
-      "Ensure the Hardhat toolbox is configured and the network is connected."
+      "Ensure the Hardhat toolbox is configured and the network is connected. " +
+      "Install the Viem toolbox with: npm install --save-dev @nomicfoundation/hardhat-toolbox-viem"
     );
   }