@ballkidz/defifa 0.0.4 → 0.0.5

package/STYLE_GUIDE.md

@@ -2,7 +2,7 @@
 
 How we write Solidity and organize repos across the Juicebox V6 ecosystem. `nana-core-v6` is the gold standard — when in doubt, match what it does.
 
-**This repo's deviations:** `via-ir = true`, `build_info = true`, `extra_output = ['storageLayout']`. Lower invariant runs (256/depth 50). Package scope: `@ballkidz/`.
+**This repo's deviations:** `via_ir = true` (stack depth). Package scope: `@ballkidz/`.
 
 ## File Organization
 
@@ -326,7 +326,7 @@ try hook.afterPayRecordedWith(context) {} catch (bytes memory reason) {
 
 ### foundry.toml
 
-Standard config across all repos:
+Standard config for `@bananapus/core-v6`:
 
 ```toml
 [profile.default]
@@ -353,18 +353,7 @@ multiline_func_header = "all"
 wrap_comments = true
 ```
 
-**Variations:**
-- `evm_version = 'cancun'` for repos using transient storage (buyback-hook, router-terminal, univ4-router)
-- `via_ir = true` for repos hitting stack-too-deep (buyback-hook, banny-retail, univ4-lp-split-hook, deploy-all)
-- `optimizer = false` only for deploy-all-v6 (stack-too-deep with optimization)
-
-**This repo uses:**
-- `via-ir = true` (note: hyphen not underscore in this repo's foundry.toml)
-- `build_info = true`, `extra_output = ['storageLayout']`
-- `[rpc_endpoints]` for ethereum, optimism, arbitrum, base, and their testnets
-- `[invariant]` with `runs = 256`, `depth = 50` (lower than standard)
-- No `[fuzz]` section
-- `[lint]` section with `lint_on_build = false`
+This is the standard config with no deviations.
 
 ### CI Workflows
 
@@ -394,8 +383,6 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
       - name: Run tests
         run: forge test --fail-fast --summary --detailed --skip "*/script/**"
-        env:
-          RPC_ETHEREUM_MAINNET: ${{ secrets.RPC_ETHEREUM_MAINNET }}
       - name: Check contract sizes
         run: FOUNDRY_PROFILE=ci_sizes forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
 ```
@@ -423,10 +410,10 @@ jobs:
 
 ```json
 {
-  "name": "@ballkidz/defifa",
+  "name": "@bananapus/core-v6",
   "version": "x.x.x",
   "license": "MIT",
-  "repository": { "type": "git", "url": "git+https://github.com/Org/repo.git" },
+  "repository": { "type": "git", "url": "git+https://github.com/Bananapus/nana-core-v6.git" },
   "engines": { "node": ">=20.0.0" },
   "scripts": {
     "test": "forge test",
@@ -460,15 +447,6 @@ Run `forge fmt` before committing. The `[fmt]` config in `foundry.toml` enforces
 
 CI checks formatting via `forge fmt --check`.
 
-### CI Secrets
-
-| Secret | Purpose |
-|--------|--------|
-| `NPM_TOKEN` | npm publish access (used by `publish.yml`) |
-| `RPC_ETHEREUM_MAINNET` | Ethereum mainnet RPC URL for fork tests (used by `test.yml`) |
-
-Fork tests require `RPC_ETHEREUM_MAINNET` — they fail if it's missing.
-
 ### Branching
 
 - `main` is the primary branch

package/foundry.toml

@@ -6,18 +6,8 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-optimizer_runs = 200
-
 [rpc_endpoints]
 ethereum = "${RPC_ETHEREUM_MAINNET}"
-optimism = "${RPC_OPTIMISM_MAINNET}"
-arbitrum = "${RPC_ARBITRUM_MAINNET}"
-base = "${RPC_BASE_MAINNET}"
-arbitrum_sepolia = "${RPC_ARBITRUM_SEPOLIA}"
-ethereum_sepolia = "${RPC_ETHEREUM_SEPOLIA}"
-optimism_sepolia = "${RPC_OPTIMISM_SEPOLIA}"
-base_sepolia = "${RPC_BASE_SEPOLIA}"
 
 [fuzz]
 runs = 4096
@@ -27,6 +17,9 @@ runs = 1024
 depth = 100
 fail_on_revert = false
 
+[lint]
+lint_on_build = false
+
 [fmt]
 number_underscore = "thousands"
 multiline_func_header = "all"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballkidz/defifa",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "MIT",
   "engines": {
     "node": ">=20.0.0"
@@ -13,9 +13,9 @@
     "url": "https://github.com/BallKidz/defifa-collection-deployer"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.9",
+    "@bananapus/721-hook-v6": "^0.0.13",
     "@bananapus/address-registry-v6": "^0.0.4",
-    "@bananapus/core-v6": "^0.0.10",
+    "@bananapus/core-v6": "^0.0.14",
     "@bananapus/permission-ids-v6": "^0.0.5",
     "@openzeppelin/contracts": "5.2.0",
     "@prb/math": "^4.1.1",

package/src/DefifaDeployer.sol

@@ -411,8 +411,8 @@ contract DefifaDeployer is IDefifaDeployer, IDefifaGamePhaseReporter, IDefifaGam
         }
 
         // Make sure the provided gameplay timestamps are sequential and that there is a mint duration.
-        // slither-disable-next-line incorrect-equality
         if (
+            // slither-disable-next-line incorrect-equality
             launchProjectData.mintPeriodDuration == 0
                 || launchProjectData.start
                     < block.timestamp + launchProjectData.refundPeriodDuration + launchProjectData.mintPeriodDuration

package/src/DefifaHook.sol

@@ -532,6 +532,7 @@ contract DefifaHook is JB721Hook, Ownable, IDefifaHook {
     /// @notice Mint reserved tokens within the tier for the provided value.
     /// @param tierId The ID of the tier to mint within.
     /// @param count The number of reserved tokens to mint.
+    // slither-disable-next-line reentrancy-no-eth
     function mintReservesFor(uint256 tierId, uint256 count) public override {
         // Minting reserves must not be paused.
         if (JB721TiersRulesetMetadataResolver.mintPendingReservesPaused(

package/test/DefifaGovernor.t.sol

@@ -444,8 +444,8 @@ contract DefifaGovernorTest is JBTest, TestBaseWorkflow {
     }
 
     function testSetCashOutRatesAndRedeem_multipleTiers(uint8 nTiers, uint8[] calldata distribution) public {
-        vm.assume(nTiers > 10 && nTiers < 100);
-        vm.assume(distribution.length < nTiers);
+        nTiers = uint8(bound(uint256(nTiers), 11, 99));
+        vm.assume(distribution.length > 0 && distribution.length < nTiers);
 
         uint256 _sumDistribution;
         for (uint256 i = 0; i < distribution.length; i++) {