@bannynet/core-v6 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bannynet/core-v6",
-    "version": "0.0.8",
+    "version": "0.0.9",
     "license": "MIT",
     "repository": {
         "type": "git",

package/script/Deploy.s.sol

@@ -82,6 +82,8 @@ contract DeployScript is Script, Sphinx {
     uint104 constant BAN_BASE_AUTO_ISSUANCE = 10_097_684_379_816_492_953_872;
     uint104 constant BAN_OP_AUTO_ISSUANCE = 328_366_065_858_064_488_000;
     uint104 constant BAN_ARB_AUTO_ISSUANCE = 2_825_980_000_000_000_000_000;
+    // forge-lint: disable-next-line(unsafe-typecast)
+    uint104 constant BAN_PREMINT_COUNT = uint104(1_000_000 * DECIMAL_MULTIPLIER);
 
     function configureSphinx() public override {
         sphinxConfig.projectName = "banny-core-v6";
@@ -179,12 +181,8 @@ contract DeployScript is Script, Sphinx {
 
         {
             REVAutoIssuance[] memory autoIssuances = new REVAutoIssuance[](1);
-            autoIssuances[0] = REVAutoIssuance({
-                // forge-lint: disable-next-line(unsafe-typecast)
-                chainId: PREMINT_CHAIN_ID,
-                count: uint104(1_000_000 * DECIMAL_MULTIPLIER),
-                beneficiary: operator
-            });
+            autoIssuances[0] =
+                REVAutoIssuance({chainId: PREMINT_CHAIN_ID, count: BAN_PREMINT_COUNT, beneficiary: operator});
 
             // decrease by a smaller percent more frequently. 30 days, 7%-ish.
             stageConfigurations[1] = REVStageConfig({

package/script/helpers/BannyverseDeploymentLib.sol

@@ -79,9 +79,9 @@ library BannyverseDeploymentLib {
         view
         returns (address)
     {
-        // forge-lint: disable-next-line(unsafe-cheatcode)
         string memory deploymentJson =
-            vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
         return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }

package/test/Banny721TokenUriResolver.t.sol

@@ -79,10 +79,12 @@ contract MockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
@@ -166,7 +168,7 @@ contract TestBanny721TokenUriResolver is Test {
     // --- Constructor --------------------------------------------------- //
     //*********************************************************************//
 
-    function test_constructor_setsDefaults() public {
+    function test_constructor_setsDefaults() public view {
         assertEq(resolver.BANNY_BODY(), "<path/>");
         assertEq(resolver.DEFAULT_NECKLACE(), "<necklace/>");
         assertEq(resolver.DEFAULT_MOUTH(), "<mouth/>");
@@ -607,27 +609,27 @@ contract TestBanny721TokenUriResolver is Test {
         resolver.decorateBannyWith(address(hook), BODY_TOKEN, 0, outfitIds1);
 
         // Create a new necklace token.
-        uint256 NECKLACE_TOKEN_2 = 11_000_000_001;
-        _setupTier(NECKLACE_TOKEN_2, 11, 3); // Same category (3)
-        hook.setOwner(NECKLACE_TOKEN_2, alice);
+        uint256 necklaceToken2 = 11_000_000_001;
+        _setupTier(necklaceToken2, 11, 3); // Same category (3)
+        hook.setOwner(necklaceToken2, alice);
 
         // Replace with new necklace. Old one should be returned.
         uint256[] memory outfitIds2 = new uint256[](1);
-        outfitIds2[0] = NECKLACE_TOKEN_2;
+        outfitIds2[0] = necklaceToken2;
         vm.prank(alice);
         resolver.decorateBannyWith(address(hook), BODY_TOKEN, 0, outfitIds2);
 
         // Old necklace returned to alice.
         assertEq(hook.ownerOf(NECKLACE_TOKEN), alice, "old necklace should be returned");
         // New necklace held by resolver.
-        assertEq(hook.ownerOf(NECKLACE_TOKEN_2), address(resolver), "new necklace should be held");
+        assertEq(hook.ownerOf(necklaceToken2), address(resolver), "new necklace should be held");
     }
 
     //*********************************************************************//
     // --- onERC721Received ---------------------------------------------- //
     //*********************************************************************//
 
-    function test_onERC721Received_acceptsFromSelf() public {
+    function test_onERC721Received_acceptsFromSelf() public view {
         bytes4 result = resolver.onERC721Received(address(resolver), alice, 1, "");
         assertEq(result, IERC721Receiver.onERC721Received.selector, "should accept from self");
     }
@@ -641,7 +643,7 @@ contract TestBanny721TokenUriResolver is Test {
     // --- View: assetIdsOf with no outfits ------------------------------ //
     //*********************************************************************//
 
-    function test_assetIdsOf_empty() public {
+    function test_assetIdsOf_empty() public view {
         (uint256 backgroundId, uint256[] memory outfitIds) = resolver.assetIdsOf(address(hook), BODY_TOKEN);
         assertEq(backgroundId, 0, "no background initially");
         assertEq(outfitIds.length, 0, "no outfits initially");
@@ -651,11 +653,11 @@ contract TestBanny721TokenUriResolver is Test {
     // --- View: userOf / wearerOf --------------------------------------- //
     //*********************************************************************//
 
-    function test_userOf_returnsZeroIfNotAttached() public {
+    function test_userOf_returnsZeroIfNotAttached() public view {
         assertEq(resolver.userOf(address(hook), BACKGROUND_TOKEN), 0, "no user initially");
     }
 
-    function test_wearerOf_returnsZeroIfNotWorn() public {
+    function test_wearerOf_returnsZeroIfNotWorn() public view {
         assertEq(resolver.wearerOf(address(hook), NECKLACE_TOKEN), 0, "no wearer initially");
     }
 

package/test/BannyAttacks.t.sol

@@ -70,10 +70,12 @@ contract AttackMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/DecorateFlow.t.sol

@@ -70,10 +70,12 @@ contract DecorateFlowMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/Fork.t.sol

@@ -27,7 +27,6 @@ import {JB721TiersHookFlags} from "@bananapus/721-hook-v6/src/structs/JB721Tiers
 import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
 import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
@@ -113,10 +112,12 @@ contract ReentrantMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
@@ -299,13 +300,13 @@ contract BannyForkTest is Test {
         assertEq(IERC721(address(bannyHook)).ownerOf(ORIGINAL_BODY_1), alice);
     }
 
-    function test_fork_e2e_alienBodyDefaultEyes() public {
+    function test_fork_e2e_alienBodyDefaultEyes() public view {
         // Alice owns ALIEN_BODY_1. Naked alien body should inject alien eyes in SVG.
         string memory svg = resolver.svgOf(address(bannyHook), ALIEN_BODY_1, true, false);
         assertGt(bytes(svg).length, 0, "alien body SVG should render");
     }
 
-    function test_fork_e2e_outfitRenderedOnMannequin() public {
+    function test_fork_e2e_outfitRenderedOnMannequin() public view {
         // Unequipped outfit token should render on mannequin.
         string memory uri = resolver.tokenUriOf(address(bannyHook), NECKLACE_1);
         assertGt(bytes(uri).length, 0, "outfit URI should render on mannequin");
@@ -781,14 +782,14 @@ contract BannyForkTest is Test {
     // 7. TOKEN URI RENDERING
     // ═══════════════════════════════════════════════════════════════════════
 
-    function test_fork_render_nakedBodyHasDefaultInjections() public {
+    function test_fork_render_nakedBodyHasDefaultInjections() public view {
         // A naked body should still render with default necklace, eyes, mouth.
         string memory svg = resolver.svgOf(address(bannyHook), ORIGINAL_BODY_1, true, false);
         assertGt(bytes(svg).length, 0, "naked body should render");
         // The SVG should contain the body path and defaults.
     }
 
-    function test_fork_render_allFourBodyTypes() public {
+    function test_fork_render_allFourBodyTypes() public view {
         // Each body type should render.
         string memory alienSvg = resolver.svgOf(address(bannyHook), ALIEN_BODY_1, true, false);
         string memory pinkSvg = resolver.svgOf(address(bannyHook), PINK_BODY_1, true, false);
@@ -1011,17 +1012,17 @@ contract BannyForkTest is Test {
         assertEq(outfitIds.length, 0);
     }
 
-    function test_fork_edge_assetIdsEmptyInitially() public {
+    function test_fork_edge_assetIdsEmptyInitially() public view {
         (uint256 bgId, uint256[] memory outfitIds) = resolver.assetIdsOf(address(bannyHook), ORIGINAL_BODY_1);
         assertEq(bgId, 0);
         assertEq(outfitIds.length, 0);
     }
 
-    function test_fork_edge_wearerOfUnwornReturnsZero() public {
+    function test_fork_edge_wearerOfUnwornReturnsZero() public view {
         assertEq(resolver.wearerOf(address(bannyHook), NECKLACE_1), 0);
     }
 
-    function test_fork_edge_userOfUnusedBackgroundReturnsZero() public {
+    function test_fork_edge_userOfUnusedBackgroundReturnsZero() public view {
         assertEq(resolver.userOf(address(bannyHook), BACKGROUND_1), 0);
     }
 
@@ -1136,7 +1137,7 @@ contract BannyForkTest is Test {
         resolver.decorateBannyWith(address(bannyHook), ORIGINAL_BODY_1, 0, outfits);
     }
 
-    function test_fork_edge_namesReturnsCorrectData() public {
+    function test_fork_edge_namesReturnsCorrectData() public view {
         // Verify namesOf returns correct product name for each body type.
         (string memory alienFull,,) = resolver.namesOf(address(bannyHook), ALIEN_BODY_1);
         assertGt(bytes(alienFull).length, 0, "alien name should not be empty");
@@ -1791,6 +1792,7 @@ contract BannyForkTest is Test {
     // Internal helpers
     // ═══════════════════════════════════════════════════════════════════════
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function _deployJBCore() internal {
         jbPermissions = new JBPermissions(trustedForwarder);
         jbProjects = new JBProjects(multisig, address(0), trustedForwarder);
@@ -1944,6 +1946,7 @@ contract BannyForkTest is Test {
         });
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function _mintInitialNFTs() internal {
         // Mint bodies and outfits to alice, bob.
         vm.startPrank(multisig); // hook owner can mint

package/test/regression/BodyCategoryValidation.t.sol

@@ -62,6 +62,7 @@ contract MockStore57 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/BurnedTokenCheck.t.sol

@@ -73,6 +73,7 @@ contract MockStore62 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/CEIReorder.t.sol

@@ -70,6 +70,7 @@ contract MockStoreI25 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/MsgSenderEvents.t.sol

@@ -63,6 +63,7 @@ contract MockStore56 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/RemovedTierDesync.t.sol

@@ -77,6 +77,7 @@ contract MockStoreM8 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }