format

Author: spidemen

src/Blueprint.sol

@@ -128,7 +128,8 @@ contract Blueprint is Initializable, OwnableUpgradeable, BlueprintCore {
         emit CreditReward(userAddress, amount);
     }
     // 6 %。=  6 / 100  means fee =6 and baseFactor = 100
-    function setGlobalPlatformFee(uint256 fee,uint256 baseFactor) public isAdmin {
+
+    function setGlobalPlatformFee(uint256 fee, uint256 baseFactor) public isAdmin {
         // base factor should be greater or equal than 10
         require(baseFactor >= 10, "Base factor should be greater than or equal to 10");
         require(fee <= baseFactor, "Fee cannot be greater than factor");

src/BlueprintCore.sol

@@ -446,7 +446,6 @@ contract BlueprintCore is Initializable, EIP712, Payment {
         requestID = createAgent(signerAddr, projectId, base64Proposal, privateWorkerAddress, serverURL, 0, tokenAddress);
     }
 
-
     function resetDeployment(
         address userAddress,
         bytes32 projectId,
@@ -675,11 +674,7 @@ contract BlueprintCore is Initializable, EIP712, Payment {
     }
 
     // set copy agent fee, this can be called by owner only
-    function setCopyAgentFee(
-        bytes32 agentRequestID,
-        address tokenAddress,
-        uint256 fee
-    ) public payable {
+    function setCopyAgentFee(bytes32 agentRequestID, address tokenAddress, uint256 fee) public payable {
         require(fee > 0, "Fee must be greater than 0");
         require(paymentAddressEnableMp[tokenAddress], "Invalid token address");
         // check if it owner of requestID
@@ -710,20 +705,10 @@ contract BlueprintCore is Initializable, EIP712, Payment {
         uint256 creatorFee = fee - platformCopyAgentFee;
 
         // platform fee
-        payWithERC20(
-            tokenAddress,
-            collectionWalletFee,
-            msg.sender,
-            feeCollectionWalletAddress
-        );
+        payWithERC20(tokenAddress, collectionWalletFee, msg.sender, feeCollectionWalletAddress);
 
         // creator fee
-        payWithERC20(
-            tokenAddress,
-            creatorFee,
-            msg.sender,
-            deploymentOwners[originalAgentRequestID]
-        );
+        payWithERC20(tokenAddress, creatorFee, msg.sender, deploymentOwners[originalAgentRequestID]);
 
         emit CopyAgentRequest(copyID, originalAgentRequestID, msg.sender);
     }

src/BlueprintV7.sol

@@ -7,7 +7,7 @@ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";
 import "./Blueprint.sol";
 
-contract BlueprintV6 is Initializable, UUPSUpgradeable, OwnableUpgradeable, Blueprint {
+contract BlueprintV7 is Initializable, UUPSUpgradeable, OwnableUpgradeable, Blueprint {
     string public constant SIGNING_DOMAIN = "nation.fun";
 
     /// @custom:oz-upgrades-validate-as-initializer

test/BlueprintV6.t.sol

@@ -242,11 +242,9 @@ contract BlueprintTest is Test {
         // set zero cost for create agents, use any number less than 0
         blueprint.setUpdateCreateAgentTokenCost(address(mockToken), 0);
 
-        bytes32 updateHash =
-            keccak256(abi.encodePacked(block.timestamp, address(this), requestId, base64Proposal, block.chainid));
         // Expect the UpdateDeploymentConfig event
         vm.expectEmit(true, true, true, true);
-        emit BlueprintCore.UpdateDeploymentConfigs(projectId, requestId, workerAddress, updateHash, base64Proposal);
+        emit BlueprintCore.UpdateDeploymentConfig(projectId, requestId, workerAddress, base64Proposal);
 
         // update agent deployment config
         blueprint.updateWorkerDeploymentConfig(address(mockToken), projectId, requestId, base64Proposal);

test/BlueprintV7.t.sol

@@ -0,0 +1,60 @@
+pragma solidity ^0.8.26;
+
+import {Test, console} from "forge-std/Test.sol";
+import {Vm} from "forge-std/Vm.sol";
+import {BlueprintV7} from "../src/BlueprintV7.sol";
+import {BlueprintCore} from "../src/BlueprintCore.sol";
+import {Blueprint} from "../src/Blueprint.sol";
+import {stdError} from "forge-std/StdError.sol";
+import {MockERC20} from "./MockERC20.sol";
+
+contract BlueprintTest is Test {
+    BlueprintV7 public blueprint;
+    MockERC20 public mockToken;
+    bytes32 public projectId;
+    address public workerAddress;
+    address public dummyAddress;
+    uint256 signerPrivateKey;
+
+    function setUp() public {
+        blueprint = new BlueprintV7();
+        blueprint.initialize(); // mimic upgradeable contract deploy behavior
+
+        mockToken = new MockERC20();
+
+        // set crestal wallet address
+        blueprint.setFeeCollectionWalletAddress(address(0x7D8be0Dd8915E3511fFDDABDD631812be824f578));
+
+        projectId = bytes32(0x2723a34e38d0f0aa09ce626f00aa23c0464b52c75516cf3203cc4c9afeaf2980);
+        workerAddress = address(0x4d6585D89F889F29f77fd7Dd71864269BA1B31df);
+        dummyAddress = address(0);
+        signerPrivateKey = 0xA11CE;
+    }
+
+    function test_updateWorkerDeploymentConfig() public {
+        string memory base64Proposal = "test base64 proposal";
+        string memory serverURL = "app.crestal.network";
+
+        // Add the payment address
+        blueprint.addPaymentAddress(address(mockToken));
+
+        // set zero cost for create agents, use any number less than 0
+        blueprint.setCreateAgentTokenCost(address(mockToken), 0);
+
+        // Create agent with token
+        bytes32 requestId =
+            blueprint.createAgentWithToken(projectId, base64Proposal, workerAddress, serverURL, address(mockToken));
+
+        // set zero cost for create agents, use any number less than 0
+        blueprint.setUpdateCreateAgentTokenCost(address(mockToken), 0);
+
+        bytes32 updateHash =
+            keccak256(abi.encodePacked(block.timestamp, address(this), requestId, base64Proposal, block.chainid));
+        // Expect the UpdateDeploymentConfig event
+        vm.expectEmit(true, true, true, true);
+        emit BlueprintCore.DeploymentConfigUpdate(projectId, requestId, workerAddress, updateHash, base64Proposal);
+
+        // update agent deployment config
+        blueprint.updateWorkerDeploymentConfig(address(mockToken), projectId, requestId, base64Proposal);
+    }
+}