@bananapus/distributor-v6 0.0.18 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/distributor-v6",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "deploy:testnets": "source ./.env && npx sphinx propose ./script/Deploy.s.sol --networks testnets"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.51",
-    "@bananapus/core-v6": "^0.0.54",
+    "@bananapus/721-hook-v6": "^0.0.52",
+    "@bananapus/core-v6": "^0.0.55",
     "@bananapus/permission-ids-v6": "^0.0.25",
     "@openzeppelin/contracts": "5.6.1",
     "@prb/math": "4.1.1"

package/script/Deploy.s.sol

@@ -16,7 +16,9 @@ contract Deploy is Script {
         uint256 roundDuration = vm.envUint("ROUND_DURATION");
         uint256 vestingRounds = vm.envUint("VESTING_ROUNDS");
 
-        new JB721Distributor(directory, roundDuration, vestingRounds);
+        new JB721Distributor({
+            directory: directory, initialRoundDuration: roundDuration, initialVestingRounds: vestingRounds
+        });
 
         vm.stopBroadcast();
     }

package/src/JB721Distributor.sol

@@ -77,14 +77,14 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
     //*********************************************************************//
 
     /// @param directory The JB directory used to verify terminal/controller callers.
-    /// @param roundDuration_ The duration of each round, specified in seconds.
-    /// @param vestingRounds_ The number of rounds until tokens are fully vested.
+    /// @param initialRoundDuration The duration of each round, specified in seconds.
+    /// @param initialVestingRounds The number of rounds until tokens are fully vested.
     constructor(
         IJBDirectory directory,
-        uint256 roundDuration_,
-        uint256 vestingRounds_
+        uint256 initialRoundDuration,
+        uint256 initialVestingRounds
     )
-        JBDistributor(roundDuration_, vestingRounds_)
+        JBDistributor(initialRoundDuration, initialVestingRounds)
     {
         DIRECTORY = directory;
     }
@@ -109,7 +109,7 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
     function processSplitWith(JBSplitHookContext calldata context) external payable override {
         // Only terminals and controllers for the project can call this.
         if (
-            !DIRECTORY.isTerminalOf(context.projectId, IJBTerminal(msg.sender))
+            !DIRECTORY.isTerminalOf({projectId: context.projectId, terminal: IJBTerminal(msg.sender)})
                 && DIRECTORY.controllerOf(context.projectId) != IERC165(msg.sender)
         ) revert JB721Distributor_Unauthorized({projectId: context.projectId, caller: msg.sender});
 
@@ -266,7 +266,7 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
 
         // Use the checkpoints module to verify the token's snapshot owner had voting power at the round's snapshot
         // block. If the token did not exist then, ownerOfAt returns zero above and the token is not eligible.
-        uint256 pastVotes = IVotes(address(IJB721TiersHook(hook).CHECKPOINTS()))
+        uint256 pastVotes = IVotes(address(IJB721TiersHook(hook).checkpoints()))
             .getPastVotes({account: owner, timepoint: snapshotBlock});
 
         // If the owner had no voting power at round start, the token is ineligible.
@@ -278,14 +278,14 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
     }
 
     /// @notice The total stake at a specific block, using the hook's checkpoints module for historical accuracy.
-    /// @dev Uses `IVotes.getPastTotalSupply` from the hook's CHECKPOINTS module. This ensures that only NFTs
+    /// @dev Uses `IVotes.getPastTotalSupply` from the hook's checkpoints module. This ensures that only NFTs
     /// that existed (and were delegated) at `blockNumber` are counted, preventing late mints from diluting or
     /// capturing rewards within the current round.
     /// @param hook The hook to get the total stake for.
     /// @param blockNumber The block number to get the total staked amount at.
     /// @return total The total checkpointed voting units at the given block.
     function _totalStake(address hook, uint256 blockNumber) internal view override returns (uint256 total) {
-        IJB721Checkpoints checkpoints = IJB721TiersHook(hook).CHECKPOINTS();
+        IJB721Checkpoints checkpoints = IJB721TiersHook(hook).checkpoints();
         total = IVotes(address(checkpoints)).getPastTotalSupply(blockNumber);
     }
 
@@ -311,7 +311,7 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
         returns (address owner)
     {
         // The 721 hook owns the checkpoint module; the distributor only trusts that module's historical proof.
-        IJB721Checkpoints checkpoints = IJB721TiersHook(hook).CHECKPOINTS();
+        IJB721Checkpoints checkpoints = IJB721TiersHook(hook).checkpoints();
 
         // Use staticcall so older hooks without `ownerOfAt` fail closed instead of reverting the whole distribution.
         (bool success, bytes memory data) =
@@ -382,7 +382,7 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
             if (owner == address(0)) return (0, newUniqueCount);
 
             // Query the owner's checkpointed voting power at the round's snapshot block.
-            pastVotes = IVotes(address(IJB721TiersHook(ctx.hook).CHECKPOINTS()))
+            pastVotes = IVotes(address(IJB721TiersHook(ctx.hook).checkpoints()))
                 .getPastVotes({account: owner, timepoint: snapshotBlock});
 
             // If the snapshot owner had no voting power at round start, the token is ineligible for this round.

package/src/JBDistributor.sol

@@ -119,13 +119,15 @@ abstract contract JBDistributor is IJBDistributor {
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    /// @param roundDuration_ The duration of each round, specified in seconds.
-    /// @param vestingRounds_ The number of rounds until tokens are fully vested.
-    constructor(uint256 roundDuration_, uint256 vestingRounds_) {
-        if (roundDuration_ == 0) revert JBDistributor_InvalidRoundDuration({roundDuration: roundDuration_});
+    /// @param initialRoundDuration The duration of each round, specified in seconds.
+    /// @param initialVestingRounds The number of rounds until tokens are fully vested.
+    constructor(uint256 initialRoundDuration, uint256 initialVestingRounds) {
+        if (initialRoundDuration == 0) {
+            revert JBDistributor_InvalidRoundDuration({roundDuration: initialRoundDuration});
+        }
         startingTimestamp = block.timestamp;
-        roundDuration = roundDuration_;
-        vestingRounds = vestingRounds_;
+        roundDuration = initialRoundDuration;
+        vestingRounds = initialVestingRounds;
     }
 
     //*********************************************************************//
@@ -202,7 +204,7 @@ abstract contract JBDistributor is IJBDistributor {
             }
             // Use balance delta to handle fee-on-transfer tokens correctly.
             uint256 balanceBefore = token.balanceOf(address(this));
-            token.safeTransferFrom(msg.sender, address(this), amount);
+            token.safeTransferFrom({from: msg.sender, to: address(this), value: amount});
             amount = token.balanceOf(address(this)) - balanceBefore;
         }
         _balanceOf[hook][token] += amount;
@@ -283,7 +285,7 @@ abstract contract JBDistributor is IJBDistributor {
             JBVestingData memory vesting = vestingDataOf[hook][tokenId][token][vestedIndex];
 
             // Use `original - alreadyPaid` to include rounding dust in the remaining amount.
-            tokenAmount += vesting.amount - mulDiv(vesting.amount, vesting.shareClaimed, MAX_SHARE);
+            tokenAmount += vesting.amount - mulDiv({x: vesting.amount, y: vesting.shareClaimed, denominator: MAX_SHARE});
 
             unchecked {
                 ++vestedIndex;
@@ -329,11 +331,14 @@ abstract contract JBDistributor is IJBDistributor {
 
             if (lockedShare == 0 && vesting.shareClaimed < MAX_SHARE) {
                 // Final unlock: compute remaining as `original - alreadyPaid` to include dust.
-                tokenAmount += vesting.amount - mulDiv(vesting.amount, vesting.shareClaimed, MAX_SHARE);
+                tokenAmount += vesting.amount
+                - mulDiv({x: vesting.amount, y: vesting.shareClaimed, denominator: MAX_SHARE});
             } else {
                 uint256 newShareClaimed = MAX_SHARE - lockedShare;
                 if (newShareClaimed > vesting.shareClaimed) {
-                    tokenAmount += mulDiv(vesting.amount, newShareClaimed - vesting.shareClaimed, MAX_SHARE);
+                    tokenAmount += mulDiv({
+                        x: vesting.amount, y: newShareClaimed - vesting.shareClaimed, denominator: MAX_SHARE
+                    });
                 }
             }
 
@@ -542,7 +547,7 @@ abstract contract JBDistributor is IJBDistributor {
                             });
                         }
                     } else {
-                        token.safeTransfer(beneficiary, totalTokenAmount);
+                        token.safeTransfer({to: beneficiary, value: totalTokenAmount});
                     }
                 }
                 // If forfeiture: _balanceOf is NOT decremented so the forfeited tokens
@@ -598,9 +603,12 @@ abstract contract JBDistributor is IJBDistributor {
                 if (lockedShare == 0 && vesting.shareClaimed < MAX_SHARE) {
                     // Final unlock: compute remaining amount as `original - alreadyPaid` to force
                     // rounding dust out so nothing is stranded in the entry.
-                    claimAmount = vesting.amount - mulDiv(vesting.amount, vesting.shareClaimed, MAX_SHARE);
+                    claimAmount =
+                        vesting.amount - mulDiv({x: vesting.amount, y: vesting.shareClaimed, denominator: MAX_SHARE});
                 } else if (MAX_SHARE - lockedShare > vesting.shareClaimed) {
-                    claimAmount = mulDiv(vesting.amount, MAX_SHARE - lockedShare - vesting.shareClaimed, MAX_SHARE);
+                    claimAmount = mulDiv({
+                        x: vesting.amount, y: MAX_SHARE - lockedShare - vesting.shareClaimed, denominator: MAX_SHARE
+                    });
                 }
 
                 if (claimAmount != 0) {
@@ -682,7 +690,9 @@ abstract contract JBDistributor is IJBDistributor {
             }
 
             // Keep a reference to the amount of tokens being claimed.
-            uint256 tokenAmount = mulDiv(distributable, _tokenStake({hook: hook, tokenId: tokenId}), totalStakeAmount);
+            uint256 tokenAmount = mulDiv({
+                x: distributable, y: _tokenStake({hook: hook, tokenId: tokenId}), denominator: totalStakeAmount
+            });
 
             // Skip zero-amount entries to prevent stalling latestVestedIndexOf advancement.
             if (tokenAmount == 0) {

package/src/JBTokenDistributor.sol

@@ -49,14 +49,14 @@ contract JBTokenDistributor is JBDistributor, IJBTokenDistributor {
     //*********************************************************************//
 
     /// @param directory The JB directory used to verify terminal/controller callers.
-    /// @param roundDuration_ The duration of each round, specified in seconds.
-    /// @param vestingRounds_ The number of rounds until tokens are fully vested.
+    /// @param initialRoundDuration The duration of each round, specified in seconds.
+    /// @param initialVestingRounds The number of rounds until tokens are fully vested.
     constructor(
         IJBDirectory directory,
-        uint256 roundDuration_,
-        uint256 vestingRounds_
+        uint256 initialRoundDuration,
+        uint256 initialVestingRounds
     )
-        JBDistributor(roundDuration_, vestingRounds_)
+        JBDistributor(initialRoundDuration, initialVestingRounds)
     {
         DIRECTORY = directory;
     }
@@ -79,7 +79,7 @@ contract JBTokenDistributor is JBDistributor, IJBTokenDistributor {
     function processSplitWith(JBSplitHookContext calldata context) external payable override {
         // Only terminals and controllers for the project can call this.
         if (
-            !DIRECTORY.isTerminalOf(context.projectId, IJBTerminal(msg.sender))
+            !DIRECTORY.isTerminalOf({projectId: context.projectId, terminal: IJBTerminal(msg.sender)})
                 && DIRECTORY.controllerOf(context.projectId) != IERC165(msg.sender)
         ) revert JBTokenDistributor_Unauthorized({projectId: context.projectId, caller: msg.sender});
 
@@ -160,7 +160,8 @@ contract JBTokenDistributor is JBDistributor, IJBTokenDistributor {
         if (tokenId >> 160 != 0) revert JBTokenDistributor_InvalidTokenId({tokenId: tokenId});
         // The high bits were checked above, so this cast recovers the encoded address.
         // forge-lint: disable-next-line(unsafe-typecast)
-        tokenStakeAmount = IVotes(hook).getPastVotes(address(uint160(tokenId)), roundSnapshotBlock[currentRound()]);
+        address account = address(uint160(tokenId));
+        tokenStakeAmount = IVotes(hook).getPastVotes({account: account, timepoint: roundSnapshotBlock[currentRound()]});
     }
 
     /// @notice The total supply of votes at a specific block.