@rev-net/core-v6 0.0.11 → 0.0.13

package/script/Deploy.s.sol

@@ -1,11 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/buyback-hook-v6/script/helpers/BuybackDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
 
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
@@ -20,7 +26,6 @@ import {JBTokenMapping} from "@bananapus/suckers-v6/src/structs/JBTokenMapping.s
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
-import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 import {IJBBuybackHookRegistry} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHookRegistry.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
@@ -30,12 +35,21 @@ import {REVConfig} from "../src/structs/REVConfig.sol";
 import {REVDescription} from "../src/structs/REVDescription.sol";
 import {REVStageConfig} from "../src/structs/REVStageConfig.sol";
 import {REVSuckerDeploymentConfig} from "../src/structs/REVSuckerDeploymentConfig.sol";
-import {REVLoans, IREVLoans} from "./../src/REVLoans.sol";
+import {REVLoans} from "./../src/REVLoans.sol";
+import {REVDeploy721TiersHookConfig} from "../src/structs/REVDeploy721TiersHookConfig.sol";
+import {REVCroptopAllowedPost} from "../src/structs/REVCroptopAllowedPost.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
+import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
+import {REVBaseline721HookConfig} from "../src/structs/REVBaseline721HookConfig.sol";
+import {REV721TiersHookFlags} from "../src/structs/REV721TiersHookFlags.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
     JBTerminalConfig[] terminalConfigurations;
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
+    REVDeploy721TiersHookConfig tiered721HookConfiguration;
+    REVCroptopAllowedPost[] allowedPosts;
 }
 
 contract DeployScript is Script, Sphinx {
@@ -52,26 +66,47 @@ contract DeployScript is Script, Sphinx {
     /// @notice tracks the deployment of the router terminal.
     RouterTerminalDeployment routerTerminal;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint32 PREMINT_CHAIN_ID = 1;
+    // forge-lint: disable-next-line(mixed-case-variable)
     string NAME = "Revnet";
+    // forge-lint: disable-next-line(mixed-case-variable)
     string SYMBOL = "REV";
+    // forge-lint: disable-next-line(mixed-case-variable)
     string PROJECT_URI = "ipfs://QmcCBD5fM927LjkLDSJWtNEU9FohcbiPSfqtGRHXFHzJ4W";
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint32 NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint32 ETH_CURRENCY = JBCurrencyIds.ETH;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint8 DECIMALS = 18;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 DECIMAL_MULTIPLIER = 10 ** DECIMALS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 ERC20_SALT = "_REV_ERC20_SALT_V6_";
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 SUCKER_SALT = "_REV_SUCKER_SALT_V6_";
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 DEPLOYER_SALT = "_REV_DEPLOYER_SALT_V6_";
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 REVLOANS_SALT = "_REV_LOANS_SALT_V6_";
+    // forge-lint: disable-next-line(mixed-case-variable)
     address LOANS_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     address OPERATOR;
+    // forge-lint: disable-next-line(mixed-case-variable)
     address TRUSTED_FORWARDER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IPermit2 PERMIT2;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint48 REV_START_TIME = 1_740_089_444;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint104 REV_MAINNET_AUTO_ISSUANCE_ = 1_050_482_341_387_116_262_330_122;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint104 REV_BASE_AUTO_ISSUANCE_ = 38_544_322_230_437_559_731_228;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint104 REV_OP_AUTO_ISSUANCE_ = 32_069_388_242_375_817_844;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint104 REV_ARB_AUTO_ISSUANCE_ = 3_479_431_776_906_850_000_000;
 
     function configureSphinx() public override {
@@ -90,32 +125,43 @@ contract DeployScript is Script, Sphinx {
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
         core = CoreDeploymentLib.getDeployment(
-            vm.envOr("NANA_CORE_DEPLOYMENT_PATH", string("node_modules/@bananapus/core-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_CORE_DEPLOYMENT_PATH", defaultValue: string("node_modules/@bananapus/core-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the suckers contracts for this chain.
         suckers = SuckerDeploymentLib.getDeployment(
-            vm.envOr("NANA_SUCKERS_DEPLOYMENT_PATH", string("node_modules/@bananapus/suckers-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_SUCKERS_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/suckers-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         croptop = CroptopDeploymentLib.getDeployment(
-            vm.envOr("CROPTOP_CORE_DEPLOYMENT_PATH", string("node_modules/@croptop/core-v6/deployments/"))
+            vm.envOr({
+                name: "CROPTOP_CORE_DEPLOYMENT_PATH", defaultValue: string("node_modules/@croptop/core-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         hook = Hook721DeploymentLib.getDeployment(
-            vm.envOr("NANA_721_DEPLOYMENT_PATH", string("node_modules/@bananapus/721-hook-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_721_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/721-hook-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the router terminal contracts for this chain.
         routerTerminal = RouterTerminalDeploymentLib.getDeployment(
-            vm.envOr(
-                "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
-                string("node_modules/@bananapus/router-terminal-v6/deployments/")
-            )
+            vm.envOr({
+                name: "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/router-terminal-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         buybackHook = BuybackDeploymentLib.getDeployment(
-            vm.envOr(
-                "NANA_BUYBACK_HOOK_DEPLOYMENT_PATH", string("node_modules/@bananapus/buyback-hook-v6/deployments/")
-            )
+            vm.envOr({
+                name: "NANA_BUYBACK_HOOK_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/buyback-hook-v6/deployments/")
+            })
         );
 
         // We use the same trusted forwarder and permit2 as the core deployment.
@@ -169,6 +215,7 @@ contract DeployScript is Script, Sphinx {
                 autoIssuances: issuanceConfs,
                 splitPercent: 3800, // 38%
                 splits: splits,
+                // forge-lint: disable-next-line(unsafe-typecast)
                 initialIssuance: uint112(10_000 * DECIMAL_MULTIPLIER),
                 issuanceCutFrequency: 90 days,
                 issuanceCutPercent: 380_000_000, // 38%
@@ -180,7 +227,11 @@ contract DeployScript is Script, Sphinx {
         {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
             issuanceConfs[0] = REVAutoIssuance({
-                chainId: PREMINT_CHAIN_ID, count: uint104(1_550_000 * DECIMAL_MULTIPLIER), beneficiary: OPERATOR
+                // forge-lint: disable-next-line(unsafe-typecast)
+                chainId: PREMINT_CHAIN_ID,
+                // forge-lint: disable-next-line(unsafe-typecast)
+                count: uint104(1_550_000 * DECIMAL_MULTIPLIER),
+                beneficiary: OPERATOR
             });
 
             stageConfigurations[1] = REVStageConfig({
@@ -210,7 +261,7 @@ contract DeployScript is Script, Sphinx {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(NAME, SYMBOL, PROJECT_URI, ERC20_SALT),
+            description: REVDescription({name: NAME, ticker: SYMBOL, uri: PROJECT_URI, salt: ERC20_SALT}),
             baseCurrency: ETH_CURRENCY,
             splitOperator: OPERATOR,
             stageConfigurations: stageConfigurations
@@ -220,9 +271,8 @@ contract DeployScript is Script, Sphinx {
         JBTokenMapping[] memory tokenMappings = new JBTokenMapping[](1);
         tokenMappings[0] = JBTokenMapping({
             localToken: JBConstants.NATIVE_TOKEN,
-            remoteToken: bytes32(uint256(uint160(JBConstants.NATIVE_TOKEN))),
             minGas: 200_000,
-            minBridgeAmount: 0.01 ether
+            remoteToken: bytes32(uint256(uint160(JBConstants.NATIVE_TOKEN)))
         });
 
         REVSuckerDeploymentConfig memory suckerDeploymentConfiguration;
@@ -262,20 +312,48 @@ contract DeployScript is Script, Sphinx {
         return FeeProjectConfig({
             configuration: revnetConfiguration,
             terminalConfigurations: terminalConfigurations,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVDeploy721TiersHookConfig({
+                baseline721HookConfiguration: REVBaseline721HookConfig({
+                    name: "",
+                    symbol: "",
+                    baseUri: "",
+                    tokenUriResolver: IJB721TokenUriResolver(address(0)),
+                    contractUri: "",
+                    tiersConfig: JB721InitTiersConfig({
+                        tiers: new JB721TierConfig[](0), currency: ETH_CURRENCY, decimals: 18
+                    }),
+                    reserveBeneficiary: address(0),
+                    flags: REV721TiersHookFlags({
+                        noNewTiersWithReserves: false,
+                        noNewTiersWithVotes: false,
+                        noNewTiersWithOwnerMinting: false,
+                        preventOverspending: false
+                    })
+                }),
+                salt: bytes32(0),
+                preventSplitOperatorAdjustingTiers: false,
+                preventSplitOperatorUpdatingMetadata: false,
+                preventSplitOperatorMinting: false,
+                preventSplitOperatorIncreasingDiscountPercent: false
+            }),
+            allowedPosts: new REVCroptopAllowedPost[](0)
         });
     }
 
     function deploy() public sphinx {
         // TODO figure out how to reference project ID if the contracts are already deployed.
+        // forge-lint: disable-next-line(mixed-case-variable)
         uint256 FEE_PROJECT_ID = core.projects.createFor(safeAddress());
 
         // Deploy REVLoans first — it only depends on the controller.
-        (address _revloansAddr, bool _revloansIsDeployed) = _isDeployed(
-            REVLOANS_SALT,
-            type(REVLoans).creationCode,
-            abi.encode(core.controller, core.projects, FEE_PROJECT_ID, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER)
-        );
+        (address _revloansAddr, bool _revloansIsDeployed) = _isDeployed({
+            salt: REVLOANS_SALT,
+            creationCode: type(REVLoans).creationCode,
+            arguments: abi.encode(
+                core.controller, core.projects, FEE_PROJECT_ID, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER
+            )
+        });
         REVLoans revloans = _revloansIsDeployed
             ? REVLoans(payable(_revloansAddr))
             : new REVLoans{salt: REVLOANS_SALT}({
@@ -288,10 +366,10 @@ contract DeployScript is Script, Sphinx {
             });
 
         // Deploy REVDeployer with the REVLoans and buyback hook addresses.
-        (address _deployerAddr, bool _deployerIsDeployed) = _isDeployed(
-            DEPLOYER_SALT,
-            type(REVDeployer).creationCode,
-            abi.encode(
+        (address _deployerAddr, bool _deployerIsDeployed) = _isDeployed({
+            salt: DEPLOYER_SALT,
+            creationCode: type(REVDeployer).creationCode,
+            arguments: abi.encode(
                 core.controller,
                 suckers.registry,
                 FEE_PROJECT_ID,
@@ -301,22 +379,22 @@ contract DeployScript is Script, Sphinx {
                 address(revloans),
                 TRUSTED_FORWARDER
             )
-        );
+        });
         REVDeployer _basicDeployer = _deployerIsDeployed
             ? REVDeployer(payable(_deployerAddr))
-            : new REVDeployer{salt: DEPLOYER_SALT}(
-                core.controller,
-                suckers.registry,
-                FEE_PROJECT_ID,
-                hook.hook_deployer,
-                croptop.publisher,
-                IJBBuybackHookRegistry(address(buybackHook.registry)),
-                address(revloans),
-                TRUSTED_FORWARDER
-            );
+            : new REVDeployer{salt: DEPLOYER_SALT}({
+                controller: core.controller,
+                suckerRegistry: suckers.registry,
+                feeRevnetId: FEE_PROJECT_ID,
+                hookDeployer: hook.hook_deployer,
+                publisher: croptop.publisher,
+                buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
+                loans: address(revloans),
+                trustedForwarder: TRUSTED_FORWARDER
+            });
 
         // Approve the basic deployer to configure the project.
-        core.projects.approve(address(_basicDeployer), FEE_PROJECT_ID);
+        core.projects.approve({to: address(_basicDeployer), tokenId: FEE_PROJECT_ID});
 
         // Build the config.
         FeeProjectConfig memory feeProjectConfig = getFeeProjectConfig();
@@ -326,7 +404,9 @@ contract DeployScript is Script, Sphinx {
             revnetId: FEE_PROJECT_ID,
             configuration: feeProjectConfig.configuration,
             terminalConfigurations: feeProjectConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: feeProjectConfig.tiered721HookConfiguration,
+            allowedPosts: feeProjectConfig.allowedPosts
         });
     }
 
@@ -339,6 +419,10 @@ contract DeployScript is Script, Sphinx {
         view
         returns (address deployedTo, bool isDeployed)
     {
+        // Note: This uses the Arachnid deterministic-deployment-proxy address, which differs from
+        // the Sphinx deployer used at runtime. As a result, the predicted address won't match and
+        // _isDeployed will always return false when deploying via Sphinx. This is benign — it just
+        // means contracts are always freshly deployed rather than skipped.
         address _deployedTo = vm.computeCreate2Address({
             salt: salt,
             initCodeHash: keccak256(abi.encodePacked(creationCode, arguments)),

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -9,6 +9,7 @@ import {IREVDeployer} from "./../../src/interfaces/IREVDeployer.sol";
 import {IREVLoans} from "./../../src/interfaces/IREVLoans.sol";
 
 struct RevnetCoreDeployment {
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVDeployer basic_deployer;
     IREVLoans loans;
 }
@@ -16,6 +17,7 @@ struct RevnetCoreDeployment {
 library RevnetCoreDeploymentLib {
     // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
     address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+    // forge-lint: disable-next-line(screaming-snake-case-const)
     Vm internal constant vm = Vm(VM_ADDRESS);
 
     function getDeployment(string memory path) internal returns (RevnetCoreDeployment memory deployment) {
@@ -29,7 +31,7 @@ library RevnetCoreDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name);
+                return getDeployment({path: path, network_name: networks[_i].name});
             }
         }
 
@@ -38,16 +40,24 @@ library RevnetCoreDeploymentLib {
 
     function getDeployment(
         string memory path,
+        // forge-lint: disable-next-line(mixed-case-variable)
         string memory network_name
     )
         internal
         view
         returns (RevnetCoreDeployment memory deployment)
     {
-        deployment.basic_deployer =
-            IREVDeployer(_getDeploymentAddress(path, "revnet-core-v6", network_name, "REVDeployer"));
+        deployment.basic_deployer = IREVDeployer(
+            _getDeploymentAddress({
+                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVDeployer"
+            })
+        );
 
-        deployment.loans = IREVLoans(_getDeploymentAddress(path, "revnet-core-v6", network_name, "REVLoans"));
+        deployment.loans = IREVLoans(
+            _getDeploymentAddress({
+                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVLoans"
+            })
+        );
     }
 
     /// @notice Get the address of a contract that was deployed by the Deploy script.
@@ -57,7 +67,9 @@ library RevnetCoreDeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
+        // forge-lint: disable-next-line(mixed-case-variable)
         string memory project_name,
+        // forge-lint: disable-next-line(mixed-case-variable)
         string memory network_name,
         string memory contractName
     )
@@ -66,7 +78,8 @@ library RevnetCoreDeploymentLib {
         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, project_name, "/", network_name, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }