@bannynet/core-v6 0.0.31 → 0.0.33

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.33 — Bump v6 deps to nana-core-v6 0.0.53 cohort
+
+- `@bananapus/core-v6`: `^0.0.49 → ^0.0.53` ([PR #145](https://github.com/Bananapus/nana-core-v6/pull/145)).
+- `@bananapus/721-hook-v6`: `^0.0.49 → ^0.0.50`.
+- `@bananapus/buyback-hook-v6`: `^0.0.45 → ^0.0.46`.
+- `@bananapus/suckers-v6`: `^0.0.43 → ^0.0.46`.
+- All `JBRulesetMetadata` test literals patched to include `pauseCrossProjectFeeFreeInflows: false`.
+
 ## Scope
 
 This file describes the verified change from `banny-retail-v5` to the current `banny-retail-v6` repo.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bannynet/core-v6",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -32,13 +32,13 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'banny-core-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.49",
-    "@bananapus/buyback-hook-v6": "^0.0.45",
-    "@bananapus/core-v6": "^0.0.49",
-    "@bananapus/router-terminal-v6": "^0.0.43",
-    "@bananapus/suckers-v6": "^0.0.43",
+    "@bananapus/721-hook-v6": "^0.0.51",
+    "@bananapus/buyback-hook-v6": "^0.0.47",
+    "@bananapus/core-v6": "^0.0.54",
+    "@bananapus/router-terminal-v6": "^0.0.44",
+    "@bananapus/suckers-v6": "^0.0.47",
     "@openzeppelin/contracts": "5.6.1",
-    "@rev-net/core-v6": "^0.0.55",
+    "@rev-net/core-v6": "^0.0.57",
     "keccak": "3.0.4"
   },
   "devDependencies": {

package/script/Add.Denver.s.sol

@@ -24,7 +24,7 @@ contract Drop1Script is Script, Sphinx {
     address reserveBeneficiary;
 
     function configureSphinx() public override {
-        // TODO: Update to contain revnet devs.
+        // Safe owners and threshold are resolved by the Sphinx project config.
         sphinxConfig.projectName = "banny-core-v6";
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
@@ -39,10 +39,10 @@ contract Drop1Script is Script, Sphinx {
         );
 
         // Get the deployment addresses for the 721 hook contracts for this chain.
-        bannyverse = BannyverseDeploymentLib.getDeployment(
-            vm.envOr("BANNYVERSE_CORE_DEPLOYMENT_PATH", string("deployments/")),
-            vm.envOr("BANNYVERSE_REVNET_ID", uint256(4))
-        );
+        bannyverse = BannyverseDeploymentLib.getDeployment({
+            path: vm.envOr("BANNYVERSE_CORE_DEPLOYMENT_PATH", string("deployments/")),
+            revnetId: vm.envOr("BANNYVERSE_REVNET_ID", uint256(4))
+        });
 
         // Get the hook address by using the deployer.
         hook = JB721TiersHook(address(revnet.owner.tiered721HookOf(bannyverse.revnetId)));

package/script/Deploy.s.sol

@@ -408,11 +408,11 @@ contract DeployScript is Script, Sphinx {
             // Deploy it if it has not been deployed yet.
             resolver = !_resolverIsDeployed
                 ? new Banny721TokenUriResolver{salt: RESOLVER_SALT}({
-                    bannyBody: bannyBodySvg,
-                    defaultNecklace: defaultNecklaceSvg,
-                    defaultMouth: defaultMouthSvg,
-                    defaultStandardEyes: defaultStandardEyesSvg,
-                    defaultAlienEyes: defaultAlienEyesSvg,
+                    bannyBodySvg: bannyBodySvg,
+                    defaultNecklaceSvg: defaultNecklaceSvg,
+                    defaultMouthSvg: defaultMouthSvg,
+                    defaultStandardEyesSvg: defaultStandardEyesSvg,
+                    defaultAlienEyesSvg: defaultAlienEyesSvg,
                     owner: operator,
                     trustedForwarder: trustedForwarder
                 })

package/script/Drop1.s.sol

@@ -24,7 +24,7 @@ contract Drop1Script is Script, Sphinx {
     address reserveBeneficiary;
 
     function configureSphinx() public override {
-        // TODO: Update to contain revnet devs.
+        // Safe owners and threshold are resolved by the Sphinx project config.
         sphinxConfig.projectName = "banny-core-v6";
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
@@ -39,10 +39,10 @@ contract Drop1Script is Script, Sphinx {
         );
 
         // Get the deployment addresses for the 721 hook contracts for this chain.
-        bannyverse = BannyverseDeploymentLib.getDeployment(
-            vm.envOr("BANNYVERSE_CORE_DEPLOYMENT_PATH", string("deployments/")),
-            vm.envOr("BANNYVERSE_REVNET_ID", uint256(4))
-        );
+        bannyverse = BannyverseDeploymentLib.getDeployment({
+            path: vm.envOr("BANNYVERSE_CORE_DEPLOYMENT_PATH", string("deployments/")),
+            revnetId: vm.envOr("BANNYVERSE_REVNET_ID", uint256(4))
+        });
 
         // Get the hook address by using the deployer.
         hook = JB721TiersHook(address(revnet.owner.tiered721HookOf(bannyverse.revnetId)));

package/script/helpers/BannyverseDeploymentLib.sol

@@ -26,11 +26,10 @@ library BannyverseDeploymentLib {
         internal
         returns (BannyverseDeployment memory deployment)
     {
-        // get chainId for which we need to get the deployment.
+        // Match the current chain ID to the Sphinx network name used in deployment artifacts.
         uint256 chainId = block.chainid;
 
-        // Deploy to get the constants.
-        // TODO: get constants without deploy.
+        // `SphinxConstants` exposes Sphinx's supported chain ID to network name mapping.
         SphinxConstants sphinxConstants = new SphinxConstants();
         NetworkInfo[] memory networks = sphinxConstants.getNetworkInfoArray();
 

package/src/Banny721TokenUriResolver.sol

@@ -119,19 +119,19 @@ contract Banny721TokenUriResolver is
     mapping(uint256 upc => bytes32) public override svgHashOf;
 
     /// @notice The default alien-eye SVG fragment used when rendering a Banny without custom alien eyes.
-    string public override DEFAULT_ALIEN_EYES;
+    string public override defaultAlienEyes;
 
     /// @notice The default mouth SVG fragment used when rendering a Banny without a custom mouth.
-    string public override DEFAULT_MOUTH;
+    string public override defaultMouth;
 
     /// @notice The default necklace SVG fragment used when rendering a Banny without a custom necklace.
-    string public override DEFAULT_NECKLACE;
+    string public override defaultNecklace;
 
     /// @notice The default standard-eye SVG fragment used when rendering a Banny without custom standard eyes.
-    string public override DEFAULT_STANDARD_EYES;
+    string public override defaultStandardEyes;
 
     /// @notice The base Banny body SVG fragment used as the starting layer for token rendering.
-    string public override BANNY_BODY;
+    string public override bannyBody;
 
     //*********************************************************************//
     // --------------------- internal stored properties ------------------ //
@@ -180,30 +180,30 @@ contract Banny721TokenUriResolver is
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    /// @param bannyBody The SVG of the banny body.
-    /// @param defaultNecklace The SVG of the default necklace.
-    /// @param defaultMouth The SVG of the default mouth.
-    /// @param defaultStandardEyes The SVG of the default standard eyes.
-    /// @param defaultAlienEyes The SVG of the default alien eyes.
+    /// @param bannyBodySvg The SVG of the banny body.
+    /// @param defaultNecklaceSvg The SVG of the default necklace.
+    /// @param defaultMouthSvg The SVG of the default mouth.
+    /// @param defaultStandardEyesSvg The SVG of the default standard eyes.
+    /// @param defaultAlienEyesSvg The SVG of the default alien eyes.
     /// @param owner The owner allowed to add SVG files that correspond to product IDs.
     /// @param trustedForwarder The trusted forwarder for the ERC2771Context.
     constructor(
-        string memory bannyBody,
-        string memory defaultNecklace,
-        string memory defaultMouth,
-        string memory defaultStandardEyes,
-        string memory defaultAlienEyes,
+        string memory bannyBodySvg,
+        string memory defaultNecklaceSvg,
+        string memory defaultMouthSvg,
+        string memory defaultStandardEyesSvg,
+        string memory defaultAlienEyesSvg,
         address owner,
         address trustedForwarder
     )
         Ownable(owner)
         ERC2771Context(trustedForwarder)
     {
-        BANNY_BODY = bannyBody;
-        DEFAULT_NECKLACE = defaultNecklace;
-        DEFAULT_MOUTH = defaultMouth;
-        DEFAULT_STANDARD_EYES = defaultStandardEyes;
-        DEFAULT_ALIEN_EYES = defaultAlienEyes;
+        bannyBody = bannyBodySvg;
+        defaultNecklace = defaultNecklaceSvg;
+        defaultMouth = defaultMouthSvg;
+        defaultStandardEyes = defaultStandardEyesSvg;
+        defaultAlienEyes = defaultAlienEyesSvg;
     }
 
     //*********************************************************************//
@@ -589,7 +589,7 @@ contract Banny721TokenUriResolver is
             ";}.a3{fill:#",
             a3,
             ";}</style>",
-            BANNY_BODY
+            bannyBody
         );
     }
 
@@ -816,7 +816,7 @@ contract Banny721TokenUriResolver is
     function _mannequinBannySvg() internal view returns (string memory) {
         return string.concat(
             "<style>.o{fill:#808080;}.b1{fill:none;}.b2{fill:none;}.b3{fill:none;}.b4{fill:none;}.a1{fill:none;}.a2{fill:none;}.a3{fill:none;}</style>",
-            BANNY_BODY
+            bannyBody
         );
     }
 
@@ -895,7 +895,7 @@ contract Banny721TokenUriResolver is
                 hasNecklace = true;
                 customNecklace = _svgOf({hook: hook, upc: upc});
             } else if (category > _NECKLACE_CATEGORY && !hasNecklace) {
-                contents = string.concat(contents, DEFAULT_NECKLACE);
+                contents = string.concat(contents, defaultNecklace);
                 hasNecklace = true;
             }
 
@@ -906,8 +906,8 @@ contract Banny721TokenUriResolver is
             if (category == _EYES_CATEGORY) {
                 hasEyes = true;
             } else if (category > _EYES_CATEGORY && !hasEyes && !hasHead) {
-                if (bodyUpc == ALIEN_UPC) contents = string.concat(contents, DEFAULT_ALIEN_EYES);
-                else contents = string.concat(contents, DEFAULT_STANDARD_EYES);
+                if (bodyUpc == ALIEN_UPC) contents = string.concat(contents, defaultAlienEyes);
+                else contents = string.concat(contents, defaultStandardEyes);
 
                 hasEyes = true;
             }
@@ -915,7 +915,7 @@ contract Banny721TokenUriResolver is
             if (category == _MOUTH_CATEGORY) {
                 hasMouth = true;
             } else if (category > _MOUTH_CATEGORY && !hasMouth && !hasHead) {
-                contents = string.concat(contents, DEFAULT_MOUTH);
+                contents = string.concat(contents, defaultMouth);
                 hasMouth = true;
             }
 

package/src/interfaces/IBanny721TokenUriResolver.sol

@@ -59,23 +59,23 @@ interface IBanny721TokenUriResolver {
 
     /// @notice The base SVG content for a banny body.
     /// @return The SVG string.
-    function BANNY_BODY() external view returns (string memory);
+    function bannyBody() external view returns (string memory);
 
     /// @notice The default SVG content for alien banny eyes.
     /// @return The SVG string.
-    function DEFAULT_ALIEN_EYES() external view returns (string memory);
+    function defaultAlienEyes() external view returns (string memory);
 
     /// @notice The default SVG content for a banny mouth.
     /// @return The SVG string.
-    function DEFAULT_MOUTH() external view returns (string memory);
+    function defaultMouth() external view returns (string memory);
 
     /// @notice The default SVG content for a banny necklace.
     /// @return The SVG string.
-    function DEFAULT_NECKLACE() external view returns (string memory);
+    function defaultNecklace() external view returns (string memory);
 
     /// @notice The default SVG content for standard banny eyes.
     /// @return The SVG string.
-    function DEFAULT_STANDARD_EYES() external view returns (string memory);
+    function defaultStandardEyes() external view returns (string memory);
 
     /// @notice Get the names associated with a token (product name, category name, and display name).
     /// @param hook The hook address of the collection.