@ballkidz/defifa 0.0.8 → 0.0.10

package/ARCHITECTURE.md

@@ -75,6 +75,8 @@ Attestor → DefifaGovernor.attestToScorecard(proposalId)
 - `@bananapus/721-hook-v6` — NFT tier system
 - `@bananapus/address-registry-v6` — Deterministic deploys
 - `@bananapus/permission-ids-v6` — Permission constants
+- `@croptop/core-v6` — Croptop integration
+- `@rev-net/core-v6` — Revnet integration
 - `@openzeppelin/contracts` — Checkpoints, Ownable, Clones
 - `@prb/math` — mulDiv
 - `scripty.sol` — On-chain scripting for SVG

package/README.md

@@ -97,7 +97,7 @@ Fees are taken as payouts during commitment fulfillment. The remaining surplus i
 ## Install
 
 ```bash
-npm install @ballkidz/defifa-collection-deployer
+npm install @ballkidz/defifa
 ```
 
 ## Develop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballkidz/defifa",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "license": "MIT",
   "engines": {
     "node": ">=20.0.0"
@@ -13,14 +13,14 @@
     "url": "https://github.com/BallKidz/defifa-collection-deployer"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.17",
-    "@bananapus/address-registry-v6": "^0.0.10",
-    "@bananapus/core-v6": "^0.0.17",
+    "@bananapus/721-hook-v6": "^0.0.19",
+    "@bananapus/address-registry-v6": "^0.0.11",
+    "@bananapus/core-v6": "^0.0.24",
     "@bananapus/permission-ids-v6": "^0.0.10",
-    "@croptop/core-v6": "^0.0.18",
+    "@croptop/core-v6": "^0.0.20",
     "@openzeppelin/contracts": "^5.6.1",
     "@prb/math": "^4.1.1",
-    "@rev-net/core-v6": "^0.0.13",
+    "@rev-net/core-v6": "^0.0.15",
     "scripty.sol": "^2.1.1"
   },
   "devDependencies": {

package/src/DefifaDeployer.sol

@@ -345,12 +345,14 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
             // Payout failed — fee stays in pot. Reset to sentinel (1) so currentGamePotOf
             // doesn't double-count the fee, while preserving the reentrancy guard.
             fulfilledCommitmentsOf[gameId] = 1;
+            // slither-disable-next-line reentrancy-events
             emit CommitmentPayoutFailed({gameId: gameId, amount: _feeAmount, reason: reason});
         }
 
         // Queue the final ruleset and emit.
         _queueFinalRuleset({gameId: gameId, metadata: _metadata});
 
+        // slither-disable-next-line reentrancy-events
         emit FulfilledCommitments({gameId: gameId, pot: _pot, caller: msg.sender});
     }
 
@@ -543,6 +545,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
         // Add the hook to the registry, contract nonce starts at 1
         REGISTRY.registerAddress({deployer: address(this), nonce: _currentNonce});
 
+        // slither-disable-next-line reentrancy-events
         emit LaunchGame(gameId, _hook, GOVERNOR, _uriResolver, msg.sender);
     }
 
@@ -619,6 +622,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
             projectId: gameId, rulesetConfigurations: rulesetConfigs, memo: "Defifa game: no contest."
         });
 
+        // slither-disable-next-line reentrancy-events
         emit QueuedNoContest(gameId, msg.sender);
     }
 

package/src/DefifaGovernor.sol

@@ -174,6 +174,7 @@ contract DefifaGovernor is Ownable, IDefifaGovernor {
         // handles sendPayoutsOf failures, ensuring the final ruleset is always queued.
         IDefifaDeployer(CONTROLLER.PROJECTS().ownerOf(gameId)).fulfillCommitmentsOf(gameId);
 
+        // slither-disable-next-line reentrancy-events
         emit ScorecardRatified(gameId, scorecardId, msg.sender);
     }
 

package/src/DefifaHook.sol

@@ -284,8 +284,9 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
 
         // Use this contract as the only cash out hook.
         hookSpecifications = new JBCashOutHookSpecification[](1);
-        hookSpecifications[0] =
-            JBCashOutHookSpecification({hook: this, amount: 0, metadata: abi.encode(_cumulativeMintPrice)});
+        hookSpecifications[0] = JBCashOutHookSpecification({
+            hook: this, noop: false, amount: 0, metadata: abi.encode(_cumulativeMintPrice)
+        });
 
         // Compute the cash out count based on the game phase.
         cashOutCount = DefifaHookLib.computeCashOutCount({

package/test/DefifaGovernor.t.sol

@@ -558,8 +558,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
     )
         internal
     {
-        uint256 _pot = jbMultiTerminal()
-            .currentSurplusOf(_projectId, jbMultiTerminal().accountingContextsOf(_projectId), 18, JBCurrencyIds.ETH);
+        uint256 _pot = jbMultiTerminal().currentSurplusOf(_projectId, new address[](0), 18, JBCurrencyIds.ETH);
         // Assert that the deployer did *NOT* receive any fee tokens.
         assertEq(IERC20(_protocolFeeProjectTokenAccount).balanceOf(address(deployer)), 0);
         assertEq(IERC20(_defifaProjectTokenAccount).balanceOf(address(deployer)), 0);
@@ -569,8 +568,8 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
             _verifySingleCashOut(_projectId, _nft, scorecards[i], _users[i], _pot, _sumDistribution, distribution, i);
         }
         // All NFTs should have been redeemed, only some dust should be left
-        uint256 remainingSurplus = jbMultiTerminal()
-            .currentSurplusOf(_projectId, jbMultiTerminal().accountingContextsOf(_projectId), 18, JBCurrencyIds.ETH);
+        uint256 remainingSurplus =
+            jbMultiTerminal().currentSurplusOf(_projectId, new address[](0), 18, JBCurrencyIds.ETH);
         uint256 _expected = _pot * (_nft.TOTAL_CASHOUT_WEIGHT() - assignedCashOutWeight) / _nft.TOTAL_CASHOUT_WEIGHT();
         assertApproxEqAbs(remainingSurplus, _expected, 10 ** 14);
 
@@ -884,8 +883,7 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         _governor.ratifyScorecardFrom(_gameId, scorecards);
         vm.warp(block.timestamp + 1);
 
-        uint256 _pot = jbMultiTerminal()
-            .currentSurplusOf(_projectId, jbMultiTerminal().accountingContextsOf(_projectId), 18, JBCurrencyIds.ETH);
+        uint256 _pot = jbMultiTerminal().currentSurplusOf(_projectId, new address[](0), 18, JBCurrencyIds.ETH);
 
         // Verify that the cashOutWeights actually changed
         for (uint256 i = 0; i < _users.length; i++) {
@@ -932,8 +930,8 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
         }
         // All NFTs should have been redeemed, only some dust should be left
         // Max allowed dust is 0.0001
-        uint256 remainingSurplus = jbMultiTerminal()
-            .currentSurplusOf(_projectId, jbMultiTerminal().accountingContextsOf(_projectId), 18, JBCurrencyIds.ETH);
+        uint256 remainingSurplus =
+            jbMultiTerminal().currentSurplusOf(_projectId, new address[](0), 18, JBCurrencyIds.ETH);
         assertApproxEqAbs(
             remainingSurplus, _pot * (totalCashOutWeight - assignedCashOutWeight) / totalCashOutWeight, 10 ** 14
         );

package/test/DefifaNoContest.t.sol

@@ -892,9 +892,7 @@ contract DefifaNoContestTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return
-            jbMultiTerminal()
-                .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 18, JBCurrencyIds.ETH);
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 18, JBCurrencyIds.ETH);
     }
 
     function _cashOut(address user, uint256 tid, uint256 tnum) internal {

package/test/DefifaSecurity.t.sol

@@ -678,9 +678,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return
-            jbMultiTerminal()
-                .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 18, JBCurrencyIds.ETH);
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 18, JBCurrencyIds.ETH);
     }
 
     function _cashOut(address user, uint256 tid, uint256 tnum) internal {

package/test/DefifaUSDC.t.sol

@@ -306,8 +306,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return jbMultiTerminal()
-            .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 6, uint32(uint160(address(usdc))));
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 6, uint32(uint160(address(usdc))));
     }
 
     function _generateTokenId(uint256 tierId, uint256 tokenNumber) internal pure returns (uint256) {

package/test/Fork.t.sol

@@ -2325,9 +2325,7 @@ contract DefifaForkTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return
-            jbMultiTerminal()
-                .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 18, JBCurrencyIds.ETH);
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 18, JBCurrencyIds.ETH);
     }
 
     function _balance() internal view returns (uint256) {