@ballkidz/defifa 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballkidz/defifa",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "license": "MIT",
   "engines": {
     "node": ">=20.0.0"
@@ -13,12 +13,14 @@
     "url": "https://github.com/BallKidz/defifa-collection-deployer"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.14",
-    "@bananapus/address-registry-v6": "^0.0.8",
-    "@bananapus/core-v6": "^0.0.15",
-    "@bananapus/permission-ids-v6": "^0.0.8",
+    "@bananapus/721-hook-v6": "^0.0.17",
+    "@bananapus/address-registry-v6": "^0.0.10",
+    "@bananapus/core-v6": "^0.0.17",
+    "@bananapus/permission-ids-v6": "^0.0.10",
+    "@croptop/core-v6": "^0.0.18",
     "@openzeppelin/contracts": "^5.6.1",
     "@prb/math": "^4.1.1",
+    "@rev-net/core-v6": "^0.0.13",
     "scripty.sol": "^2.1.1"
   },
   "devDependencies": {

package/script/Deploy.s.sol

@@ -7,7 +7,6 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {DefifaHook} from "../src/DefifaHook.sol";
 import {DefifaDeployer} from "../src/DefifaDeployer.sol";
 import {DefifaGovernor} from "../src/DefifaGovernor.sol";
-import {DefifaProjectOwner} from "../src/DefifaProjectOwner.sol";
 import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 
@@ -35,7 +34,7 @@ contract DeployMainnet is Script, Sphinx {
     IERC20 baseProtocolToken;
 
     function configureSphinx() public override {
-        sphinxConfig.projectName = "defifa-v5";
+        sphinxConfig.projectName = "defifa-v6";
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
     }
@@ -69,14 +68,26 @@ contract DeployMainnet is Script, Sphinx {
         if (block.chainid == 11_155_111) {
             _typeface = ITypeface(0x8C420d3388C882F40d263714d7A6e2c8DB93905F);
 
+            // Optimism.
+        } else if (block.chainid == 10) {
+            _typeface = ITypeface(0xe160e47928907894F97a0DC025c61D64E862fEAa);
+
             // Optimism sepolia.
         } else if (block.chainid == 11_155_420) {
             _typeface = ITypeface(0xe160e47928907894F97a0DC025c61D64E862fEAa);
 
+            // Base.
+        } else if (block.chainid == 8453) {
+            _typeface = ITypeface(0x3DE45A14ea0fe24037D6363Ae71Ef18F336D1C27);
+
             // Base sepolia.
         } else if (block.chainid == 84_532) {
             _typeface = ITypeface(0xEb269d9F0850CEf5e3aB0F9718fb79c466720784);
 
+            // Arbitrum.
+        } else if (block.chainid == 42_161) {
+            _typeface = ITypeface(0x431C35e9fA5152A906A38390910d0Cfcba0Fb43b);
+
             // Arb sepolia.
         } else if (block.chainid == 421_614) {
             _typeface = ITypeface(0x431C35e9fA5152A906A38390910d0Cfcba0Fb43b);
@@ -91,18 +102,20 @@ contract DeployMainnet is Script, Sphinx {
     }
 
     function deploy() public sphinx {
-        DefifaHook hook = new DefifaHook{salt: _salt}(core.directory, defifaToken, baseProtocolToken);
+        DefifaHook hook = new DefifaHook{salt: _salt}({
+            _directory: core.directory, _defifaToken: defifaToken, _baseProtocolToken: baseProtocolToken
+        });
         DefifaTokenUriResolver tokenUriResolver = new DefifaTokenUriResolver{salt: _salt}(_typeface);
-        DefifaGovernor governor = new DefifaGovernor{salt: _salt}(core.controller, safeAddress());
-        DefifaDeployer deployer = new DefifaDeployer{salt: _salt}(
-            address(hook),
-            tokenUriResolver,
-            governor,
-            core.controller,
-            registry.registry,
-            _defifaProjectId,
-            _baseProtocolProjectId
-        );
+        DefifaGovernor governor = new DefifaGovernor{salt: _salt}({controller: core.controller, owner: safeAddress()});
+        DefifaDeployer deployer = new DefifaDeployer{salt: _salt}({
+            _hookCodeOrigin: address(hook),
+            _tokenUriResolver: tokenUriResolver,
+            _governor: governor,
+            _controller: core.controller,
+            _registry: registry.registry,
+            _defifaProjectId: _defifaProjectId,
+            _baseProtocolProjectId: _baseProtocolProjectId
+        });
 
         governor.transferOwnership(address(deployer));
     }

package/script/helpers/DefifaDeploymentLib.sol

@@ -21,7 +21,7 @@ struct DefifaDeployment {
 library DefifaDeploymentLib {
     // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
     address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
-    Vm internal constant vm = Vm(VM_ADDRESS);
+    Vm internal constant VM = Vm(VM_ADDRESS);
     string constant PROJECT_NAME = "defifa-v5";
 
     function getDeployment(string memory path) internal returns (DefifaDeployment memory deployment) {
@@ -34,7 +34,7 @@ library DefifaDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name);
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -43,33 +43,48 @@ library DefifaDeploymentLib {
 
     function getDeployment(
         string memory path,
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (DefifaDeployment memory deployment)
     {
-        deployment.hook = DefifaHook(_getDeploymentAddress(path, PROJECT_NAME, network_name, "DefifaHook"));
+        deployment.hook = DefifaHook(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "DefifaHook"
+            })
+        );
 
-        deployment.deployer = DefifaDeployer(_getDeploymentAddress(path, PROJECT_NAME, network_name, "DefifaDeployer"));
+        deployment.deployer = DefifaDeployer(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "DefifaDeployer"
+            })
+        );
 
-        deployment.governor = DefifaGovernor(_getDeploymentAddress(path, PROJECT_NAME, network_name, "DefifaGovernor"));
+        deployment.governor = DefifaGovernor(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "DefifaGovernor"
+            })
+        );
 
-        deployment.tokenUriResolver =
-            DefifaTokenUriResolver(_getDeploymentAddress(path, PROJECT_NAME, network_name, "DefifaTokenUriResolver"));
+        deployment.tokenUriResolver = DefifaTokenUriResolver(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "DefifaTokenUriResolver"
+            })
+        );
     }
 
     /// @notice Get the address of a contract that was deployed by the Deploy script.
     /// @dev Reverts if the contract was not found.
     /// @param path The path to the deployment file.
-    /// @param project_name The name of the project.
-    /// @param network_name The name of the network.
+    /// @param projectName The name of the project.
+    /// @param networkName The name of the network.
     /// @param contractName The name of the contract to get the address of.
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        string memory project_name,
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -77,7 +92,8 @@ library DefifaDeploymentLib {
         returns (address)
     {
         string memory deploymentJson =
-            vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
-        return stdJson.readAddress(deploymentJson, ".address");
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        VM.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }