set accounting context before scheduling rulesets

Bananapus · Jul 8, 2024 · ddbc054 · ddbc054
1 parent dd5d1d8
commit ddbc054
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/core",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/src/JBController.sol b/src/JBController.sol
@@ -321,12 +321,12 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         // Set this contract as the project's controller in the directory.
         DIRECTORY.setControllerOf(projectId, IERC165(this));
 
-        // Queue the rulesets.
-        uint256 rulesetId = _queueRulesets(projectId, rulesetConfigurations);
-
         // Configure the terminals.
         _configureTerminals(projectId, terminalConfigurations);
 
+        // Queue the rulesets.
+        uint256 rulesetId = _queueRulesets(projectId, rulesetConfigurations);
+
         emit LaunchProject(rulesetId, projectId, projectUri, memo, _msgSender());
     }
 
@@ -374,12 +374,12 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         // Set this contract as the project's controller in the directory.
         DIRECTORY.setControllerOf(projectId, IERC165(this));
 
-        // Queue the first ruleset.
-        rulesetId = _queueRulesets(projectId, rulesetConfigurations);
-
         // Configure the terminals.
         _configureTerminals(projectId, terminalConfigurations);
 
+        // Queue the first ruleset.
+        rulesetId = _queueRulesets(projectId, rulesetConfigurations);
+
         emit LaunchRulesets(rulesetId, projectId, memo, _msgSender());
     }
 

diff --git a/test/TestLaunchProject.sol b/test/TestLaunchProject.sol
@@ -150,7 +150,6 @@ contract TestLaunchProject_Local is TestBaseWorkflow {
             decimals: 18,
             currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
-        new JBAccountingContext[](1);
         _terminalConfigurations[0] =
             JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
 

diff --git a/test/TestMetadataParserLib.sol b/test/TestMetadataParserLib.sol
@@ -422,6 +422,6 @@ contract JBDelegateMetadataLib_Test_Local is Test {
 
         // New revert to help integrators.
         vm.expectRevert(abi.encodeWithSignature("DATA_NOT_PADDED()"));
-        bytes memory _metadata = parser.createMetadata(_ids, _datas);
+        parser.createMetadata(_ids, _datas);
     }
 }
diff --git a/test/TestMintTokensOf.sol b/test/TestMintTokensOf.sol
@@ -118,7 +118,6 @@ contract TestMintTokensOf_Local is TestBaseWorkflow {
             decimals: 18,
             currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
-        new JBAccountingContext[](1);
         _terminalConfigurations[0] =
             JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
 

diff --git a/test/TestMultipleAccessLimits.sol b/test/TestMultipleAccessLimits.sol
@@ -260,18 +260,13 @@ contract TestMultipleAccessLimits_Local is TestBaseWorkflow {
 
         _projectOwner = multisig();
 
-        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](2);
-        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](2);
+        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](1);
+        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](1);
         _tokensToAccept[0] = JBAccountingContext({
             token: JBConstants.NATIVE_TOKEN,
             decimals: 18,
             currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
-        _tokensToAccept[1] = JBAccountingContext({
-            token: address(usdcToken()),
-            decimals: 6,
-            currency: uint32(uint160(address(usdcToken())))
-        });
         _terminalConfigurations[0] =
             JBTerminalConfig({terminal: __terminal, accountingContextsToAccept: _tokensToAccept});