@bananapus/core-v6 0.0.32 → 0.0.34

package/test/TestJBERC20Inheritance.sol

@@ -3,6 +3,8 @@ pragma solidity 0.8.28;
 
 import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
 import {JBERC20} from "../src/JBERC20.sol";
+import {IJBPermissions} from "../src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "../src/interfaces/IJBProjects.sol";
 import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBToken} from "../src/interfaces/IJBToken.sol";
 import {JBConstants} from "../src/libraries/JBConstants.sol";
@@ -15,7 +17,7 @@ import {JBTerminalConfig} from "../src/structs/JBTerminalConfig.sol";
 
 import {ERC20Votes} from "../src/JBERC20.sol";
 
-contract JBERC20Inheritance_Local is JBERC20, TestBaseWorkflow {
+contract JBERC20Inheritance_Local is JBERC20(IJBPermissions(address(1)), IJBProjects(address(2))), TestBaseWorkflow {
     /// This test is to verify that the inheritance order of JBERC20 is correct and that it calls the
     /// `ERC20Votes._update()`
     /// forge-config: default.allow_internal_expect_revert = true

package/test/TestTokenFlow.sol

@@ -99,8 +99,8 @@ contract TestTokenFlow_Local is TestBaseWorkflow {
             });
         } else {
             // Create a new `IJBToken` and change it's owner to the `JBTokens` contract.
-            IJBToken _newToken = IJBToken(Clones.clone(address(new JBERC20())));
-            _newToken.initialize({name: "NewTestName", symbol: "NewTestSymbol", owner: address(_tokens)});
+            IJBToken _newToken = IJBToken(Clones.clone(address(new JBERC20(jbPermissions(), jbProjects()))));
+            _newToken.initialize({name: "NewTestName", symbol: "NewTestSymbol", tokens: address(_tokens)});
 
             // Mock the token can be added to the project.
             vm.mockCall(

package/test/audit/CashOutReenterPay.t.sol

@@ -260,6 +260,7 @@ contract CashOutReenterPay is TestBaseWorkflow {
                 ruleset.cashOutTaxRate(), // Use the ruleset's 50% cash out tax rate.
                 cashOutCount, // Number of tokens being cashed out.
                 totalSupply, // Total supply for the bonding curve.
+                PAY_AMOUNT, // effectiveSurplusValue — full initial funding, no payouts yet.
                 specifications // Our malicious hook specification.
             )
         );
@@ -475,6 +476,9 @@ contract CashOutReenterPay is TestBaseWorkflow {
         // Read the current total supply for the bonding curve calculation.
         uint256 totalSupply = _tokens.totalSupplyOf(_projectId);
 
+        // Read the current surplus for the bonding curve.
+        uint256 surplus = jbTerminalStore().balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
+
         // Mock the data hook to return no hook specifications (simple cashout).
         vm.mockCall(
             DATA_HOOK,
@@ -483,6 +487,7 @@ contract CashOutReenterPay is TestBaseWorkflow {
                 ruleset.cashOutTaxRate(), // Pass through the ruleset's tax rate.
                 cashOutCount, // Number of tokens being cashed out.
                 totalSupply, // Current total supply.
+                surplus, // effectiveSurplusValue — current terminal balance.
                 new JBCashOutHookSpecification[](0) // No hooks for this cashout.
             )
         );

package/test/audit/CodexHeldFeeRounding.t.sol

@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.6;
+
+import {TestBaseWorkflow} from "../helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../../src/interfaces/IJBController.sol";
+import {IJBMultiTerminal} from "../../src/interfaces/IJBMultiTerminal.sol";
+import {IJBRulesetApprovalHook} from "../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {JBConstants} from "../../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../src/structs/JBCurrencyAmount.sol";
+import {JBFundAccessLimitGroup} from "../../src/structs/JBFundAccessLimitGroup.sol";
+import {JBRulesetConfig} from "../../src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "../../src/structs/JBRulesetMetadata.sol";
+import {JBSplitGroup} from "../../src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "../../src/structs/JBTerminalConfig.sol";
+
+contract CodexHeldFeeRoundingTest is TestBaseWorkflow {
+    IJBController private _controller;
+    IJBMultiTerminal private _terminal;
+
+    uint256 private _projectId;
+    address private _projectOwner;
+    address private _beneficiary;
+
+    function setUp() public override {
+        super.setUp();
+
+        _projectOwner = multisig();
+        _beneficiary = beneficiary();
+        _terminal = jbMultiTerminal();
+        _controller = jbController();
+
+        JBRulesetMetadata memory metadata = JBRulesetMetadata({
+            reservedPercent: 0,
+            cashOutTaxRate: 0,
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            pausePay: false,
+            pauseCreditTransfers: false,
+            allowOwnerMinting: false,
+            allowSetCustomToken: false,
+            allowTerminalMigration: true,
+            allowSetTerminals: false,
+            ownerMustSendPayouts: false,
+            allowSetController: false,
+            allowAddAccountingContext: true,
+            allowAddPriceFeed: false,
+            holdFees: true,
+            useTotalSurplusForCashOuts: false,
+            useDataHookForPay: false,
+            useDataHookForCashOut: false,
+            dataHook: address(0),
+            metadata: 0
+        });
+
+        JBCurrencyAmount[] memory payoutLimits = new JBCurrencyAmount[](1);
+        payoutLimits[0] = JBCurrencyAmount({amount: 100, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
+
+        JBCurrencyAmount[] memory surplusAllowances = new JBCurrencyAmount[](1);
+        surplusAllowances[0] = JBCurrencyAmount({amount: 0, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))});
+
+        JBFundAccessLimitGroup[] memory fundAccessLimits = new JBFundAccessLimitGroup[](1);
+        fundAccessLimits[0] = JBFundAccessLimitGroup({
+            terminal: address(_terminal),
+            token: JBConstants.NATIVE_TOKEN,
+            payoutLimits: payoutLimits,
+            surplusAllowances: surplusAllowances
+        });
+
+        JBRulesetConfig[] memory rulesetConfigs = new JBRulesetConfig[](1);
+        rulesetConfigs[0] = JBRulesetConfig({
+            mustStartAtOrAfter: 0,
+            duration: 0,
+            weight: 0,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: metadata,
+            splitGroups: new JBSplitGroup[](0),
+            fundAccessLimitGroups: fundAccessLimits
+        });
+
+        JBAccountingContext[] memory contexts = new JBAccountingContext[](1);
+        contexts[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+
+        JBTerminalConfig[] memory terminalConfigs = new JBTerminalConfig[](1);
+        terminalConfigs[0] = JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: contexts});
+
+        // Project 1 is the fee project.
+        _controller.launchProjectFor({
+            owner: _projectOwner,
+            projectUri: "fee-project",
+            rulesetConfigurations: rulesetConfigs,
+            terminalConfigurations: terminalConfigs,
+            memo: ""
+        });
+
+        _projectId = _controller.launchProjectFor({
+            owner: _projectOwner,
+            projectUri: "project",
+            rulesetConfigurations: rulesetConfigs,
+            terminalConfigurations: terminalConfigs,
+            memo: ""
+        });
+    }
+
+    function test_partialHeldFeeRepaymentCanEraseRemainingFee() external {
+        // Seed the project with enough balance to send a payout that holds fees.
+        _terminal.pay{value: 100}({
+            projectId: _projectId,
+            amount: 100,
+            token: JBConstants.NATIVE_TOKEN,
+            beneficiary: _beneficiary,
+            minReturnedTokens: 0,
+            memo: "",
+            metadata: new bytes(0)
+        });
+
+        _terminal.sendPayoutsOf({
+            projectId: _projectId,
+            token: JBConstants.NATIVE_TOKEN,
+            amount: 40,
+            currency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            minTokensPaidOut: 0
+        });
+
+        // 40 gross produces a 1 wei fee and 39 wei net payout.
+        assertEq(address(_projectOwner).balance, 39);
+
+        vm.prank(_projectOwner);
+        _terminal.addToBalanceOf{value: 1}({
+            projectId: _projectId,
+            token: JBConstants.NATIVE_TOKEN,
+            amount: 1,
+            shouldReturnHeldFees: true,
+            memo: "",
+            metadata: new bytes(0)
+        });
+
+        // After repaying only 1 wei of the 39 wei payout, the fee should still be owed in full.
+        uint256 feeProjectBalanceBefore = jbTerminalStore().balanceOf(address(_terminal), 1, JBConstants.NATIVE_TOKEN);
+        assertEq(feeProjectBalanceBefore, 0);
+
+        vm.warp(block.timestamp + 2_419_200);
+        _terminal.processHeldFeesOf(_projectId, JBConstants.NATIVE_TOKEN, 10);
+
+        uint256 feeProjectBalanceAfter = jbTerminalStore().balanceOf(address(_terminal), 1, JBConstants.NATIVE_TOKEN);
+        uint256 projectBalanceAfter =
+            jbTerminalStore().balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
+
+        // The fee project never receives the original 1 wei fee.
+        assertEq(feeProjectBalanceAfter, 0);
+        // The payer project only gets its explicit top-up recorded.
+        assertEq(projectBalanceAfter, 61);
+        // One wei remains stranded in the terminal: actual native balance exceeds tracked balances.
+        assertEq(address(_terminal).balance, 62);
+        assertEq(address(_terminal).balance - (feeProjectBalanceAfter + projectBalanceAfter), 1);
+    }
+}

package/test/helpers/TestBaseWorkflow.sol

@@ -293,7 +293,7 @@ contract TestBaseWorkflow is JBTest, DeployPermit2 {
         _jbPermissions = new JBPermissions(_trustedForwarder);
         _jbProjects = new JBProjects(_multisig, address(0), _trustedForwarder);
         _jbDirectory = new JBDirectory(_jbPermissions, _jbProjects, _multisig);
-        _jbErc20 = new JBERC20();
+        _jbErc20 = new JBERC20(_jbPermissions, _jbProjects);
         _jbTokens = new JBTokens(_jbDirectory, _jbErc20);
         _jbRulesets = new JBRulesets(_jbDirectory);
         _jbPrices = new JBPrices(_jbDirectory, _jbPermissions, _jbProjects, _multisig, _trustedForwarder);

package/test/units/static/JBERC20/JBERC20Setup.sol

@@ -3,6 +3,8 @@ pragma solidity 0.8.28;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {JBERC20} from "../../../../src/JBERC20.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
@@ -11,7 +13,10 @@ Contract that deploys a target contract with other mock contracts to satisfy the
 Tests relative to this contract will be dependent on mock calls/emits and stdStorage.
 */
 contract JBERC20Setup is JBTest {
-    address _owner = makeAddr("owner");
+    // Mocks
+    address _tokens = makeAddr("tokens");
+    IJBProjects _projects = IJBProjects(makeAddr("projects"));
+    IJBPermissions _permissions = IJBPermissions(makeAddr("permissions"));
 
     // Implementation (constructor sets _name = "invalid", cannot be initialized)
     IJBToken public _implementation;
@@ -20,8 +25,8 @@ contract JBERC20Setup is JBTest {
     IJBToken public _erc20;
 
     function erc20Setup() public virtual {
-        // Deploy the implementation
-        _implementation = new JBERC20();
+        // Deploy the implementation with immutable permissions and projects
+        _implementation = new JBERC20(_permissions, _projects);
 
         // Clone it — clones start with empty storage, so initialize() works
         _erc20 = IJBToken(Clones.clone(address(_implementation)));

package/test/units/static/JBERC20/TestInitialize.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.28;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {JBERC20} from "../../../../src/JBERC20.sol";
 import {JBERC20Setup} from "./JBERC20Setup.sol";
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 contract TestInitialize_Local is JBERC20Setup {
     string _name = "Nana";
@@ -17,21 +16,21 @@ contract TestInitialize_Local is JBERC20Setup {
     function test_ImplementationCannotBeInitialized() external {
         // The implementation has _name = "invalid" set in constructor, so initialize() must revert.
         vm.expectRevert(JBERC20.JBERC20_AlreadyInitialized.selector);
-        _implementation.initialize(_name, _symbol, _owner);
+        _implementation.initialize(_name, _symbol, _tokens);
     }
 
     function test_WhenANameIsAlreadySet() external {
         // it will revert
 
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
 
-        // ensure ownership transferred
-        address newOwner = Ownable(address(_erc20)).owner();
-        assertEq(newOwner, _owner);
+        // ensure TOKENS is set
+        address setTokens = address(JBERC20(address(_erc20)).TOKENS());
+        assertEq(setTokens, _tokens);
 
         // will fail as internal name is no longer zero length
         vm.expectRevert();
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
     }
 
     function test_WhenName_EQNothing() external {
@@ -39,17 +38,17 @@ contract TestInitialize_Local is JBERC20Setup {
 
         // will fail as internal name is no longer than zero length
         vm.expectRevert();
-        _erc20.initialize("", _symbol, _owner);
+        _erc20.initialize("", _symbol, _tokens);
     }
 
     function test_WhenNameIsValidAndNotAlreadySet() external {
-        // it will set the name and symbol and transfer ownership
+        // it will set the name, symbol, and store references
 
-        _erc20.initialize(_name, _symbol, _owner);
+        _erc20.initialize(_name, _symbol, _tokens);
 
-        // ensure ownership transferred
-        address newOwner = Ownable(address(_erc20)).owner();
-        assertEq(newOwner, _owner);
+        // ensure TOKENS is set
+        address setTokens = address(JBERC20(address(_erc20)).TOKENS());
+        assertEq(setTokens, _tokens);
 
         // name is set
         string memory _setName = IERC20Metadata(address(_erc20)).name();

package/test/units/static/JBERC20/TestName.sol

@@ -15,7 +15,7 @@ contract TestName_Local is JBERC20Setup {
 
     function test_WhenANameIsSet() external {
         // it will return the name
-        _erc20.initialize("NANAPUS", "NANA", _owner);
+        _erc20.initialize("NANAPUS", "NANA", _tokens);
 
         string memory _setName = _token.name();
         assertEq(_setName, "NANAPUS");

package/test/units/static/JBERC20/TestNonces.sol

@@ -6,6 +6,7 @@ import {JBERC20Setup} from "./JBERC20Setup.sol";
 import {SigUtils} from "./SigUtils.sol";
 
 contract TestNonces_Local is JBERC20Setup {
+    address _user = makeAddr("user");
     IERC20Permit _token;
     SigUtils sigUtils;
 
@@ -30,7 +31,7 @@ contract TestNonces_Local is JBERC20Setup {
     function test_WhenAUserHasNotCalledPermit() external view {
         // it will return zero
 
-        uint256 _nonce = _token.nonces(_owner);
+        uint256 _nonce = _token.nonces(_user);
 
         assertEq(_nonce, 0);
     }

package/test/units/static/JBERC20/TestSymbol.sol

@@ -16,7 +16,7 @@ contract TestSymbol_Local is JBERC20Setup {
     function test_WhenASymbolIsSet() external {
         // it will return a non-empty string
 
-        _erc20.initialize("NANAPUS", "NANA", _owner);
+        _erc20.initialize("NANAPUS", "NANA", _tokens);
 
         string memory _setSymbol = _token.symbol();
         assertEq(_setSymbol, "NANA");

package/test/units/static/JBTerminalStore/TestPreviewCashOutFrom.sol

@@ -453,7 +453,7 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 10e18, _totalSupply, _spec)
+            abi.encode(0, 10e18, _totalSupply, 3e18, _spec)
         );
 
         (, uint256 reclaimAmount, uint256 cashOutTaxRate, JBCashOutHookSpecification[] memory hookSpecifications) = _store.previewCashOutFrom({

package/test/units/static/JBTerminalStore/TestRecordCashOutsFor.sol

@@ -417,7 +417,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         uint256 balanceBefore = _store.balanceOf(address(this), _projectId, _accountingContexts.token);
@@ -521,7 +521,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         (, uint256 reclaimed,,) = _store.recordCashOutFor({
@@ -576,7 +576,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_NoopHookSpecHasAmount.selector, 1));
@@ -631,7 +631,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(
             address(_dataHook),
             abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
-            abi.encode(0, 1e18, _totalSupply, _spec)
+            abi.encode(0, 1e18, _totalSupply, 3e18, _spec)
         );
 
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_NoopHookSpecHasAmount.selector, 1));

package/test/units/static/JBTokens/JBTokensSetup.sol

@@ -4,6 +4,8 @@ pragma solidity 0.8.28;
 import {JBERC20} from "../../../../src/JBERC20.sol";
 import {JBTokens} from "../../../../src/JBTokens.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
 import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
@@ -15,6 +17,8 @@ Tests relative to this contract will be dependent on mock calls/emits and stdSto
 contract JBTokensSetup is JBTest {
     // Mocks
     IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
+    IJBPermissions public permissions = IJBPermissions(makeAddr("permissions"));
+    IJBProjects public projects = IJBProjects(makeAddr("projects"));
     IJBToken public jbToken;
 
     // Target Contract
@@ -22,7 +26,7 @@ contract JBTokensSetup is JBTest {
 
     function tokensSetup() public virtual {
         // Instantiate the contract being tested
-        jbToken = new JBERC20();
+        jbToken = new JBERC20(permissions, projects);
         _tokens = new JBTokens(directory, jbToken);
     }
 }