@bananapus/core-v6 0.0.16 → 0.0.18

package/test/units/static/JBSplits/TestSelfManagedSplitGroups.sol

@@ -57,9 +57,9 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     // ──────────────────
 
     function test_CallerCanSetSplitsInOwnGroupNamespace() external {
-        // Any contract can set splits when groupId's lower 160 bits == msg.sender.
+        // Self-auth requires non-zero upper 96 bits + lower 160 bits == msg.sender.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT / 2, _bene);
 
@@ -121,7 +121,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_CallerCanSetMultipleSplitsInOwnGroup() external {
         // Multiple splits in the same self-managed group.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         address payable bene1 = payable(makeAddr("bene1"));
         address payable bene2 = payable(makeAddr("bene2"));
@@ -158,7 +158,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_CallerCanOverwriteOwnSplits() external {
         // Caller can overwrite their own splits.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         address payable beneOld = payable(makeAddr("beneOld"));
         address payable beneNew = payable(makeAddr("beneNew"));
@@ -183,7 +183,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsEmitSetSplitEvent() external {
         // Setting self-managed splits emits SetSplit with correct caller.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
 
@@ -197,7 +197,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsWorkAcrossRulesets() external {
         // Caller can set splits in the same group but different rulesets.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         uint256 rulesetA = 100;
         uint256 rulesetB = 200;
@@ -227,7 +227,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
 
     function test_SelfManagedSplitsRevertOnZeroPercent() external {
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
         JBSplit[] memory splits = new JBSplit[](1);
@@ -248,7 +248,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
 
     function test_SelfManagedSplitsRevertOnExcessPercent() external {
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
         JBSplit[] memory splits = new JBSplit[](2);
@@ -278,7 +278,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsEnforceLocks() external {
         // Locked splits in a self-managed group cannot be removed.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         // Set a locked split.
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
@@ -357,6 +357,46 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
         _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
     }
 
+    // ──────────────── Bare-address groupIds require controller auth
+    // ───────────────
+
+    function test_BareAddressGroupIdRequiresControllerEvenForMatchingSender() external {
+        // A contract cannot self-auth for groupId == uint256(uint160(self)) (upper 96 bits = 0).
+        // This prevents token contracts from hijacking terminal payout splits.
+        address caller = makeAddr("maliciousToken");
+        uint256 groupId = uint256(uint160(caller)); // bare address, upper bits = 0
+
+        JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
+
+        _mockController(makeAddr("realController"));
+
+        vm.prank(caller);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBControlled.JBControlled_ControllerUnauthorized.selector, makeAddr("realController")
+            )
+        );
+        _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
+    }
+
+    function test_BareAddressGroupIdSucceedsWithControllerAuth() external {
+        // The controller CAN still set splits for bare-address groupIds (terminal payout groups).
+        address controller = makeAddr("controller");
+        address token = makeAddr("someToken");
+        uint256 groupId = uint256(uint160(token));
+
+        JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
+
+        _mockController(controller);
+
+        vm.prank(controller);
+        _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
+
+        JBSplit[] memory result = _splits.splitsOf(_projectId, _rulesetId, groupId);
+        assertEq(result.length, 1);
+        assertEq(result[0].beneficiary, _bene);
+    }
+
     // ───────────────────── Controller can still set any group
     // ──────────────────
 
@@ -382,9 +422,10 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     // ─────────────────────────────
 
     function test_MixedSelfManagedAndControllerGroupsInOneCall() external {
-        // A single setSplitGroupsOf call with one self-managed group and one controller-gated group.
+        // A single setSplitGroupsOf call with one self-managed group (non-zero upper bits) and one controller-gated
+        // group.
         address caller = makeAddr("hookContract");
-        uint256 selfGroupId = uint256(uint160(caller));
+        uint256 selfGroupId = (1 << 160) | uint256(uint160(caller));
         uint256 otherGroupId = 0;
 
         // Mock: caller IS the controller.
@@ -427,7 +468,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_MixedCallRevertsIfNonControllerSetsOtherGroup() external {
         // A call with one self-managed group (ok) and one non-owned group (reverts) in the same call.
         address caller = makeAddr("hookContract");
-        uint256 selfGroupId = uint256(uint160(caller));
+        uint256 selfGroupId = (1 << 160) | uint256(uint160(caller));
         uint256 otherGroupId = 0;
 
         _mockController(makeAddr("realController"));
@@ -472,6 +513,8 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function testFuzz_AnyAddressCanSetOwnNamespace(address caller, uint96 upperBits, uint32 percent) external {
         vm.assume(caller != address(0));
         vm.assume(percent > 0 && percent <= JBConstants.SPLITS_TOTAL_PERCENT);
+        // Self-auth requires non-zero upper bits.
+        vm.assume(upperBits > 0);
 
         uint256 groupId = (uint256(upperBits) << 160) | uint256(uint160(caller));
 

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

@@ -336,6 +336,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             cashOutCount: _cashOutCount,
             accountingContext: _accountingContexts,
             balanceAccountingContexts: _balanceContexts,
+            beneficiaryIsFeeless: false,
             metadata: ""
         });
     }
@@ -369,6 +370,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             cashOutCount: _cashOutCount,
             accountingContext: _accountingContexts,
             balanceAccountingContexts: _balanceContexts,
+            beneficiaryIsFeeless: false,
             metadata: ""
         });
 
@@ -420,6 +422,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             surplus: _reclaimedTokenAmount,
             useTotalSurplus: true,
             cashOutTaxRate: 0,
+            beneficiaryIsFeeless: false,
             metadata: ""
         });
 
@@ -442,6 +445,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             cashOutCount: _cashOutCount,
             accountingContext: _accountingContexts,
             balanceAccountingContexts: _balanceContexts,
+            beneficiaryIsFeeless: false,
             metadata: ""
         });
 
@@ -487,10 +491,78 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             cashOutCount: _cashOutCount,
             accountingContext: _accountingContexts,
             balanceAccountingContexts: _balanceContexts,
+            beneficiaryIsFeeless: false,
             metadata: ""
         });
     }
 
+    function test_GivenBeneficiaryIsFeeless_DataHookReceivesTrue()
+        external
+        whenCurrentRulesetUseTotalSurplusForCashOutsEqTrueWithHook
+    {
+        // it will pass beneficiaryIsFeeless=true through to the data hook context
+
+        // mock JBController totalTokenSupplyWithReservedTokensOf
+        mockExpect(
+            address(_controller),
+            abi.encodeCall(IJBController.totalTokenSupplyWithReservedTokensOf, (_projectId)),
+            abi.encode(_totalSupply)
+        );
+
+        // call params
+        JBAccountingContext memory _accountingContexts =
+            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        JBAccountingContext[] memory _balanceContexts = new JBAccountingContext[](1);
+
+        _balanceContexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+
+        uint256 _cashOutCount = 1e18;
+        uint256 expectedCashOuts = mulDiv(3e18, _cashOutCount, _totalSupply);
+
+        // Create the expected context — beneficiaryIsFeeless should be true.
+        JBBeforeCashOutRecordedContext memory _context = JBBeforeCashOutRecordedContext({
+            terminal: address(this),
+            holder: address(this),
+            projectId: _projectId,
+            rulesetId: uint48(block.timestamp),
+            cashOutCount: _cashOutCount,
+            totalSupply: _totalSupply,
+            surplus: JBTokenAmount({
+                token: _accountingContexts.token,
+                value: 3e18,
+                decimals: _accountingContexts.decimals,
+                currency: _accountingContexts.currency
+            }),
+            useTotalSurplus: true,
+            cashOutTaxRate: 0,
+            beneficiaryIsFeeless: true,
+            metadata: ""
+        });
+
+        // return data
+        JBCashOutHookSpecification[] memory _spec = new JBCashOutHookSpecification[](1);
+        _spec[0] = JBCashOutHookSpecification({hook: _cashOutHook, amount: 0, metadata: ""});
+
+        // The mock will only match if the context has beneficiaryIsFeeless=true.
+        mockExpect(
+            address(_dataHook),
+            abi.encodeCall(IJBRulesetDataHook.beforeCashOutRecordedWith, (_context)),
+            abi.encode(0, 1e18, _totalSupply, _spec)
+        );
+
+        (, uint256 reclaimed,,) = _store.recordCashOutFor({
+            holder: address(this),
+            projectId: _projectId,
+            cashOutCount: _cashOutCount,
+            accountingContext: _accountingContexts,
+            balanceAccountingContexts: _balanceContexts,
+            beneficiaryIsFeeless: true,
+            metadata: ""
+        });
+
+        assertEq(expectedCashOuts, reclaimed);
+    }
+
     // Probably unnecessary even though it may give us a bit of cov %.. skipping for now
     /* function test_WhenTheCurrentRulesetUseTotalSurplusForCashOutsEqFalse() external {
         // it will use the standard surplus calculation

package/docs/book.css

@@ -1,13 +0,0 @@
-table {
-    margin: 0 auto;
-    border-collapse: collapse;
-    width: 100%;
-}
-
-table td:first-child {
-    width: 15%;
-}
-  
-table td:nth-child(2) {
-    width: 25%;
-}

package/docs/book.toml

@@ -1,12 +0,0 @@
-[book]
-src = "src"
-title = ""
-
-[output.html]
-no-section-label = true
-additional-js = ["solidity.min.js"]
-additional-css = ["book.css"]
-git-repository-url = "https://github.com/Bananapus/nana-core"
-
-[output.html.fold]
-enable = true

package/docs/solidity.min.js

@@ -1,74 +0,0 @@
-hljs.registerLanguage("solidity",(()=>{"use strict";function e(){try{return!0
-}catch(e){return!1}}
-var a=/-?(\b0[xX]([a-fA-F0-9]_?)*[a-fA-F0-9]|(\b[1-9](_?\d)*(\.((\d_?)*\d)?)?|\.\d(_?\d)*)([eE][-+]?\d(_?\d)*)?|\b0)(?!\w|\$)/
-;e()&&(a=a.source.replace(/\\b/g,"(?<!\\$)\\b"));var s={className:"number",
-begin:a,relevance:0},n={
-keyword:"assembly let function if switch case default for leave break continue u256 jump jumpi stop return revert selfdestruct invalid",
-built_in:"add sub mul div sdiv mod smod exp not lt gt slt sgt eq iszero and or xor byte shl shr sar addmod mulmod signextend keccak256 pc pop dup1 dup2 dup3 dup4 dup5 dup6 dup7 dup8 dup9 dup10 dup11 dup12 dup13 dup14 dup15 dup16 swap1 swap2 swap3 swap4 swap5 swap6 swap7 swap8 swap9 swap10 swap11 swap12 swap13 swap14 swap15 swap16 mload mstore mstore8 sload sstore msize gas address balance selfbalance caller callvalue calldataload calldatasize calldatacopy codesize codecopy extcodesize extcodecopy returndatasize returndatacopy extcodehash create create2 call callcode delegatecall staticcall log0 log1 log2 log3 log4 chainid origin gasprice basefee blockhash coinbase timestamp number difficulty gaslimit",
-literal:"true false"},i={className:"string",
-begin:/\bhex'(([0-9a-fA-F]{2}_?)*[0-9a-fA-F]{2})?'/},t={className:"string",
-begin:/\bhex"(([0-9a-fA-F]{2}_?)*[0-9a-fA-F]{2})?"/};function r(e){
-return e.inherit(e.APOS_STRING_MODE,{begin:/(\bunicode)?'/})}function l(e){
-return e.inherit(e.QUOTE_STRING_MODE,{begin:/(\bunicode)?"/})}var o={
-SOL_ASSEMBLY_KEYWORDS:n,baseAssembly:e=>{
-var a=r(e),o=l(e),c=/[A-Za-z_$][A-Za-z_$0-9.]*/,d=e.inherit(e.TITLE_MODE,{
-begin:/[A-Za-z$_][0-9A-Za-z$_]*/,lexemes:c,keywords:n}),u={className:"params",
-begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,lexemes:c,keywords:n,
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,o,s]},_={
-className:"operator",begin:/:=|->/};return{keywords:n,lexemes:c,
-contains:[a,o,i,t,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,_,{
-className:"function",lexemes:c,beginKeywords:"function",end:"{",excludeEnd:!0,
-contains:[d,u,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,_]}]}},
-solAposStringMode:r,solQuoteStringMode:l,HEX_APOS_STRING_MODE:i,
-HEX_QUOTE_STRING_MODE:t,SOL_NUMBER:s,isNegativeLookbehindAvailable:e}
-;const{baseAssembly:c,solAposStringMode:d,solQuoteStringMode:u,HEX_APOS_STRING_MODE:_,HEX_QUOTE_STRING_MODE:m,SOL_NUMBER:b,isNegativeLookbehindAvailable:E}=o
-;return e=>{for(var a=d(e),s=u(e),n=[],i=0;i<32;i++)n[i]=i+1
-;var t=n.map((e=>8*e)),r=[];for(i=0;i<=80;i++)r[i]=i
-;var l=n.map((e=>"bytes"+e)).join(" ")+" ",o=t.map((e=>"uint"+e)).join(" ")+" ",g=t.map((e=>"int"+e)).join(" ")+" ",M=[].concat.apply([],t.map((e=>r.map((a=>e+"x"+a))))),p={
-keyword:"var bool string int uint "+g+o+"byte bytes "+l+"fixed ufixed "+M.map((e=>"fixed"+e)).join(" ")+" "+M.map((e=>"ufixed"+e)).join(" ")+" enum struct mapping address new delete if else for while continue break return throw emit try catch revert unchecked _ function modifier event constructor fallback receive error virtual override constant immutable anonymous indexed storage memory calldata external public internal payable pure view private returns import from as using pragma contract interface library is abstract type assembly",
-literal:"true false wei gwei szabo finney ether seconds minutes hours days weeks years",
-built_in:"self this super selfdestruct suicide now msg block tx abi blockhash gasleft assert require Error Panic sha3 sha256 keccak256 ripemd160 ecrecover addmod mulmod log0 log1 log2 log3 log4"
-},O={className:"operator",begin:/[+\-!~*\/%<>&^|=]/
-},C=/[A-Za-z_$][A-Za-z_$0-9]*/,N={className:"params",begin:/\(/,end:/\)/,
-excludeBegin:!0,excludeEnd:!0,lexemes:C,keywords:p,
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,s,b,"self"]},f={
-begin:/\.\s*/,end:/[^A-Za-z0-9$_\.]/,excludeBegin:!0,excludeEnd:!0,keywords:{
-built_in:"gas value selector address length push pop send transfer call callcode delegatecall staticcall balance code codehash wrap unwrap name creationCode runtimeCode interfaceId min max"
-},relevance:2},y=e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/,
-lexemes:C,keywords:p}),w={className:"built_in",
-begin:(E()?"(?<!\\$)\\b":"\\b")+"(gas|value|salt)(?=:)"};function x(e,a){return{
-begin:(E()?"(?<!\\$)\\b":"\\b")+e+"\\.\\s*",end:/[^A-Za-z0-9$_\.]/,
-excludeBegin:!1,excludeEnd:!0,lexemes:C,keywords:{built_in:e+" "+a},
-contains:[f],relevance:10}}var h=c(e),v=e.inherit(h,{
-contains:h.contains.concat([{begin:/\./,end:/[^A-Za-z0-9$.]/,excludeBegin:!0,
-excludeEnd:!0,keywords:{built_in:"slot offset length address selector"},
-relevance:2},{begin:/_/,end:/[^A-Za-z0-9$.]/,excludeBegin:!0,excludeEnd:!0,
-keywords:{built_in:"slot offset"},relevance:2}])});return{aliases:["sol"],
-keywords:p,lexemes:C,
-contains:[a,s,_,m,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,b,w,O,{
-className:"function",lexemes:C,
-beginKeywords:"function modifier event constructor fallback receive error",
-end:/[{;]/,excludeEnd:!0,
-contains:[y,N,w,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE],illegal:/%/
-},x("msg","gas value data sender sig"),x("block","blockhash coinbase difficulty gaslimit basefee number timestamp chainid"),x("tx","gasprice origin"),x("abi","decode encode encodePacked encodeWithSelector encodeWithSignature encodeCall"),x("bytes","concat"),f,{
-className:"class",lexemes:C,beginKeywords:"contract interface library",end:"{",
-excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"is",lexemes:C
-},y,N,w,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{lexemes:C,
-beginKeywords:"struct enum",end:"{",excludeEnd:!0,illegal:/[:"\[\]]/,
-contains:[y,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{
-beginKeywords:"import",end:";",lexemes:C,keywords:"import from as",
-contains:[y,a,s,_,m,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,O]},{
-beginKeywords:"using",end:";",lexemes:C,keywords:"using for",
-contains:[y,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,O]},{className:"meta",
-beginKeywords:"pragma",end:";",lexemes:C,keywords:{
-keyword:"pragma solidity experimental abicoder",
-built_in:"ABIEncoderV2 SMTChecker v1 v2"},
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(a,{
-className:"meta-string"}),e.inherit(s,{className:"meta-string"})]},{
-beginKeywords:"assembly",end:/\b\B/,
-contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.inherit(v,{begin:"{",
-end:"}",endsParent:!0,contains:v.contains.concat([e.inherit(v,{begin:"{",
-end:"}",contains:v.contains.concat(["self"])})])})]}],illegal:/#/}}})());
-
-// Ugly hack to reload HLJS
-hljs.initHighlightingOnLoad();