@bananapus/core-v6 0.0.49 → 0.0.52

package/src/libraries/JBRulesetMetadataResolver.sol

@@ -71,20 +71,25 @@ library JBRulesetMetadataResolver {
         return ((ruleset.metadata >> 79) & 1) == 1;
     }
 
+    function pauseCrossProjectFeeFreeInflows(JBRuleset memory ruleset) internal pure returns (bool) {
+        return ((ruleset.metadata >> 80) & 1) == 1;
+    }
+
     function useDataHookForPay(JBRuleset memory ruleset) internal pure returns (bool) {
-        return (ruleset.metadata >> 80) & 1 == 1;
+        return (ruleset.metadata >> 81) & 1 == 1;
     }
 
     function useDataHookForCashOut(JBRuleset memory ruleset) internal pure returns (bool) {
-        return (ruleset.metadata >> 81) & 1 == 1;
+        return (ruleset.metadata >> 82) & 1 == 1;
     }
 
     function dataHook(JBRuleset memory ruleset) internal pure returns (address) {
-        return address(uint160(ruleset.metadata >> 82));
+        return address(uint160(ruleset.metadata >> 83));
     }
 
     function metadata(JBRuleset memory ruleset) internal pure returns (uint16) {
-        return uint16(ruleset.metadata >> 242);
+        // 13-bit field at bits 243-255.
+        return uint16(ruleset.metadata >> 243);
     }
 
     /// @notice Pack the funding cycle metadata.
@@ -125,14 +130,16 @@ library JBRulesetMetadataResolver {
         if (rulesetMetadata.holdFees) packed |= 1 << 78;
         // scopeCashOutsToLocalBalances in bit 79.
         if (rulesetMetadata.scopeCashOutsToLocalBalances) packed |= 1 << 79;
-        // use pay data source in bit 80.
-        if (rulesetMetadata.useDataHookForPay) packed |= 1 << 80;
-        // use cash out data source in bit 81.
-        if (rulesetMetadata.useDataHookForCashOut) packed |= 1 << 81;
-        // data source address in bits 82-241.
-        packed |= uint256(uint160(address(rulesetMetadata.dataHook))) << 82;
-        // metadata in bits 242-255 (14 bits).
-        packed |= (uint256(rulesetMetadata.metadata) & 0x3FFF) << 242;
+        // pause cross-project fee-free inflows in bit 80.
+        if (rulesetMetadata.pauseCrossProjectFeeFreeInflows) packed |= 1 << 80;
+        // use pay data source in bit 81.
+        if (rulesetMetadata.useDataHookForPay) packed |= 1 << 81;
+        // use cash out data source in bit 82.
+        if (rulesetMetadata.useDataHookForCashOut) packed |= 1 << 82;
+        // data source address in bits 83-242.
+        packed |= uint256(uint160(address(rulesetMetadata.dataHook))) << 83;
+        // metadata in bits 243-255 (13 bits).
+        packed |= (uint256(rulesetMetadata.metadata) & 0x1FFF) << 243;
     }
 
     /// @notice Expand the funding cycle metadata.
@@ -155,6 +162,7 @@ library JBRulesetMetadataResolver {
             ownerMustSendPayouts: ownerMustSendPayouts(ruleset),
             holdFees: holdFees(ruleset),
             scopeCashOutsToLocalBalances: scopeCashOutsToLocalBalances(ruleset),
+            pauseCrossProjectFeeFreeInflows: pauseCrossProjectFeeFreeInflows(ruleset),
             useDataHookForPay: useDataHookForPay(ruleset),
             useDataHookForCashOut: useDataHookForCashOut(ruleset),
             dataHook: dataHook(ruleset),

package/src/structs/JBRulesetMetadata.sol

@@ -23,10 +23,12 @@ pragma solidity ^0.8.0;
 /// @custom:member holdFees If `true`, fees are accumulated but not processed until a future ruleset (or manually).
 /// @custom:member scopeCashOutsToLocalBalances If `true`, omnichain cash-out calculations use only the local chain's
 /// balances (not cross-chain aggregates).
+/// @custom:member pauseCrossProjectFeeFreeInflows If `true`, the project cannot be targeted by
+/// `payAfterCashOutTokensOf` calls during this ruleset.
 /// @custom:member useDataHookForPay If `true`, the data hook is called before recording payments.
 /// @custom:member useDataHookForCashOut If `true`, the data hook is called before recording cash outs.
 /// @custom:member dataHook Contract called before pay/cash-out to potentially override token counts or add hooks.
-/// @custom:member metadata 14 bits of application-specific metadata (upper 2 bits are ignored).
+/// @custom:member metadata 13 bits of application-specific metadata (upper 3 bits of the uint16 are ignored).
 struct JBRulesetMetadata {
     uint16 reservedPercent;
     uint16 cashOutTaxRate;
@@ -43,6 +45,7 @@ struct JBRulesetMetadata {
     bool ownerMustSendPayouts;
     bool holdFees;
     bool scopeCashOutsToLocalBalances;
+    bool pauseCrossProjectFeeFreeInflows;
     bool useDataHookForPay;
     bool useDataHookForCashOut;
     address dataHook;

package/test/helpers/JBTest.sol

@@ -68,7 +68,8 @@ contract JBTest is Test {
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),
-            metadata: 0
+            metadata: 0,
+            pauseCrossProjectFeeFreeInflows: false
         });
 
         uint256 packed = _rulesMetadata.packRulesetMetadata();
@@ -106,7 +107,8 @@ contract JBTest is Test {
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),
-            metadata: 0
+            metadata: 0,
+            pauseCrossProjectFeeFreeInflows: false
         });
     }
 
@@ -130,7 +132,8 @@ contract JBTest is Test {
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),
-            metadata: 0
+            metadata: 0,
+            pauseCrossProjectFeeFreeInflows: false
         });
 
         uint256 packed = _rulesMetadata.packRulesetMetadata();