@ballkidz/defifa 0.0.15 → 0.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -4
- package/src/DefifaDeployer.sol +6 -2
- package/src/DefifaHook.sol +4 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ballkidz/defifa",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.17",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.0.0"
|
|
@@ -13,14 +13,14 @@
|
|
|
13
13
|
"url": "https://github.com/BallKidz/defifa-collection-deployer"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@bananapus/721-hook-v6": "^0.0.
|
|
16
|
+
"@bananapus/721-hook-v6": "^0.0.28",
|
|
17
17
|
"@bananapus/address-registry-v6": "^0.0.16",
|
|
18
18
|
"@bananapus/core-v6": "^0.0.30",
|
|
19
19
|
"@bananapus/permission-ids-v6": "^0.0.15",
|
|
20
|
-
"@croptop/core-v6": "^0.0.
|
|
20
|
+
"@croptop/core-v6": "^0.0.26",
|
|
21
21
|
"@openzeppelin/contracts": "^5.6.1",
|
|
22
22
|
"@prb/math": "^4.1.1",
|
|
23
|
-
"@rev-net/core-v6": "^0.0.
|
|
23
|
+
"@rev-net/core-v6": "^0.0.24",
|
|
24
24
|
"scripty.sol": "^2.1.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
package/src/DefifaDeployer.sol
CHANGED
|
@@ -317,6 +317,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
|
|
|
317
317
|
if (pot == 0) {
|
|
318
318
|
fulfilledCommitmentsOf[gameId] = 1;
|
|
319
319
|
_queueFinalRuleset({gameId: gameId, metadata: metadata});
|
|
320
|
+
// slither-disable-next-line reentrancy-events
|
|
320
321
|
emit FulfilledCommitments({gameId: gameId, pot: 0, caller: msg.sender});
|
|
321
322
|
return;
|
|
322
323
|
}
|
|
@@ -474,8 +475,9 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
|
|
|
474
475
|
useReserveBeneficiaryAsDefault: defifaTier.shouldUseReservedTokenBeneficiaryAsDefault,
|
|
475
476
|
transfersPausable: false,
|
|
476
477
|
useVotingUnits: false,
|
|
477
|
-
|
|
478
|
-
|
|
478
|
+
cantBeRemoved: true,
|
|
479
|
+
cantIncreaseDiscountPercent: true,
|
|
480
|
+
cantBuyWithCredits: false,
|
|
479
481
|
splitPercent: 0,
|
|
480
482
|
splits: new JBSplit[](0)
|
|
481
483
|
});
|
|
@@ -489,6 +491,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
|
|
|
489
491
|
}
|
|
490
492
|
|
|
491
493
|
// Increment the nonce for this deployment.
|
|
494
|
+
// slither-disable-next-line reentrancy-benign
|
|
492
495
|
uint256 currentNonce = ++_nonce;
|
|
493
496
|
|
|
494
497
|
// Clone deterministically using sender and nonce to prevent front-running.
|
|
@@ -656,6 +659,7 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
|
|
|
656
659
|
if (totalAbsolutePercent > JBConstants.SPLITS_TOTAL_PERCENT) revert DefifaDeployer_SplitsDontAddUp();
|
|
657
660
|
|
|
658
661
|
// Store the total absolute percent for use in fulfillCommitmentsOf.
|
|
662
|
+
// slither-disable-next-line reentrancy-benign
|
|
659
663
|
_commitmentPercentOf[gameId] = totalAbsolutePercent;
|
|
660
664
|
|
|
661
665
|
// Build the splits array: user splits + Defifa + NANA (NANA last to absorb rounding).
|
package/src/DefifaHook.sol
CHANGED
|
@@ -571,6 +571,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
|
|
|
571
571
|
// Note: reserved mints dilute existing fee token claimants because they increase the total mint cost
|
|
572
572
|
// denominator without contributing new funds to the fee token balances. This is the intended design —
|
|
573
573
|
// reserved recipients receive a proportional claim on fee tokens as if they had paid to mint.
|
|
574
|
+
// slither-disable-next-line reentrancy-benign
|
|
574
575
|
_totalMintCost += tier.price * count;
|
|
575
576
|
|
|
576
577
|
for (uint256 i; i < count;) {
|
|
@@ -667,6 +668,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
|
|
|
667
668
|
// Increment the amount redeemed if this is the complete phase.
|
|
668
669
|
bool beneficiaryReceivedTokens;
|
|
669
670
|
if (isComplete) {
|
|
671
|
+
// slither-disable-next-line reentrancy-benign
|
|
670
672
|
amountRedeemed += context.reclaimedAmount.value;
|
|
671
673
|
|
|
672
674
|
// Claim the $DEFIFA and $NANA tokens for the user.
|
|
@@ -686,6 +688,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
|
|
|
686
688
|
if (context.reclaimedAmount.value == 0 && !beneficiaryReceivedTokens) revert DefifaHook_NothingToClaim();
|
|
687
689
|
|
|
688
690
|
// Decrement the paid mint cost by the cumulative mint price of the tokens being burned.
|
|
691
|
+
// slither-disable-next-line reentrancy-benign
|
|
689
692
|
_totalMintCost -= cumulativeMintPrice;
|
|
690
693
|
}
|
|
691
694
|
|
|
@@ -880,7 +883,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
|
|
|
880
883
|
|
|
881
884
|
// Record the mint. The returned token IDs correspond to the tiers passed in.
|
|
882
885
|
// slither-disable-next-line reentrancy-benign
|
|
883
|
-
(tokenIds, leftoverAmount) = store.recordMint({
|
|
886
|
+
(tokenIds, leftoverAmount,) = store.recordMint({
|
|
884
887
|
amount: amount,
|
|
885
888
|
tierIds: mintTierIds,
|
|
886
889
|
isOwnerMint: false // Not a manual mint
|