Merge pull request #15 from mejango/ci/0.0.17

ci: `v0.0.17`
mejango · Sep 18, 2024 · 2b72c10 · 2b72c10
2 parents f0da542 + ef66fd2
commit 2b72c10
Show file tree

Hide file tree

Showing 7 changed files with 3,401 additions and 230 deletions.
diff --git a/...m_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json b/...m_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json
diff --git a/...e_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json b/...e_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json
diff --git a/...m_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json b/...m_sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json
diff --git a/...t/sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json b/...t/sepolia/execution/10a8fd31ee769fc4f1e3e22fae8a31f880c9dcb961f8fc1881dfed8d5d6a657d.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@croptop/core",
-    "version": "0.0.16",
+    "version": "0.0.17",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -22,9 +22,9 @@
         "@bananapus/ownable": "^0.0.7",
         "@openzeppelin/contracts": "^5.0.2",
         "@bananapus/buyback-hook": "^0.0.20",
-        "@bananapus/swap-terminal": "^0.0.20",
-        "@bananapus/suckers": "^0.0.22",
-        "@rev-net/core": "^0.0.33"
+        "@bananapus/swap-terminal": "^0.0.21",
+        "@bananapus/suckers": "^0.0.23",
+        "@rev-net/core": "^0.0.35"
     },
     "devDependencies": {
         "@sphinx-labs/plugins": "^0.33.0"

diff --git a/script/ConfigureFeeProject.s.sol b/script/ConfigureFeeProject.s.sol
@@ -33,6 +33,7 @@ import {JB721TierConfig} from "@bananapus/721-hook/src/structs/JB721TierConfig.s
 import {JB721InitTiersConfig} from "@bananapus/721-hook/src/structs/JB721InitTiersConfig.sol";
 import {IJBPrices} from "@bananapus/core/src/interfaces/IJBPrices.sol";
 import {JB721TiersHookFlags} from "@bananapus/721-hook/src/structs/JB721TiersHookFlags.sol";
+import {IJBTerminal} from "@bananapus/core/src/interfaces/IJBTerminal.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
@@ -154,7 +155,7 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
         terminalConfigurations[0] =
             JBTerminalConfig({terminal: core.terminal, accountingContextsToAccept: accountingContextsToAccept});
         terminalConfigurations[1] = JBTerminalConfig({
-            terminal: swapTerminal.swap_terminal,
+            terminal: IJBTerminal(address(swapTerminal.swap_terminal)),
             accountingContextsToAccept: new JBAccountingContext[](0)
         });
 
@@ -197,19 +198,25 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
             extraMetadata: 0
         });
 
-        // The project's revnet configuration
-        REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(name, symbol, projectUri, ERC20_SALT),
-            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
-            splitOperator: OPERATOR,
-            stageConfigurations: stageConfigurations,
-            loanSources: new REVLoanSource[](0),
-            loans: address(0),
-            allowCrosschainSuckerExtension: true
-        });
+        REVConfig memory revnetConfiguration;
+        {
+            // The projects loan configuration.
+            REVLoanSource[] memory _loanSources = new REVLoanSource[](1);
+            _loanSources[0] = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: core.terminal});
+
+            // The project's revnet configuration
+            revnetConfiguration = REVConfig({
+                description: REVDescription(name, symbol, projectUri, ERC20_SALT),
+                baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+                splitOperator: OPERATOR,
+                stageConfigurations: stageConfigurations,
+                loanSources: _loanSources,
+                loans: address(revnet.loans),
+                allowCrosschainSuckerExtension: true
+            });
+        }
 
         REVBuybackHookConfig memory buybackHookConfiguration;
-
         {
             // The project's buyback hook configuration.
             REVBuybackPoolConfig[] memory buybackPoolConfigurations = new REVBuybackPoolConfig[](1);
@@ -237,16 +244,16 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
         {
             JBSuckerDeployerConfig[] memory suckerDeployerConfigurations;
             if (block.chainid == 1 || block.chainid == 11_155_111) {
-                suckerDeployerConfigurations = new JBSuckerDeployerConfig[](3);
+                suckerDeployerConfigurations = new JBSuckerDeployerConfig[](2);
                 // OP
                 suckerDeployerConfigurations[0] =
                     JBSuckerDeployerConfig({deployer: suckers.optimismDeployer, mappings: tokenMappings});
 
                 suckerDeployerConfigurations[1] =
                     JBSuckerDeployerConfig({deployer: suckers.baseDeployer, mappings: tokenMappings});
 
-                suckerDeployerConfigurations[2] =
-                    JBSuckerDeployerConfig({deployer: suckers.arbitrumDeployer, mappings: tokenMappings});
+                // suckerDeployerConfigurations[2] =
+                //     JBSuckerDeployerConfig({deployer: suckers.arbitrumDeployer, mappings: tokenMappings});
             } else {
                 suckerDeployerConfigurations = new JBSuckerDeployerConfig[](1);
                 // L2 -> Mainnet
@@ -332,7 +339,8 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
                 }),
                 splitOperatorCanAdjustTiers: true,
                 splitOperatorCanUpdateMetadata: false,
-                splitOperatorCanMint: false
+                splitOperatorCanMint: false,
+                splitOperatorCanIncreaseDiscountPercent: false
             }),
             allowedPosts: allowedPosts
         });