@bananapus/omnichain-deployers-v6 0.0.61 → 0.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/omnichain-deployers-v6",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "@bananapus/core-v6": "^0.0.86",
     "@bananapus/ownable-v6": "^0.0.39",
     "@bananapus/permission-ids-v6": "^0.0.31",
-    "@bananapus/suckers-v6": "^0.0.73",
+    "@bananapus/suckers-v6": "^0.0.76",
     "@openzeppelin/contracts": "5.6.1"
   },
   "devDependencies": {

package/references/runtime.md

@@ -11,11 +11,14 @@
 3. On pay, it calls the 721 hook first, then the optional extra hook with the adjusted amount context.
 4. On cash out, it can short-circuit for suckers, otherwise it forwards into the configured hook stack in order.
 5. Mint permission queries can be granted by suckers or by the configured extra hook.
+6. Peer-chain adjusted account queries forward to the configured extra hook, but missing or malformed returns are
+   treated as no contribution.
 
 ## High-risk areas
 
 - Ruleset ID prediction: if the predicted ID is wrong, hook config can be stored under the wrong key.
 - Hook composition order: 721 logic runs before any extra hook, which affects both specs and accounting.
+- Hook metadata decoding: split-credit metadata must satisfy the full ABI tuple minimum before it is decoded.
 - Sucker exemptions: early-return cash-out behavior is intentional and should not be removed casually.
 - Carry-forward logic: queueing rulesets without new tiers intentionally reuses the latest 721 hook.
 - Meta-transaction sender handling: salt derivation uses `_msgSender()`, not raw `msg.sender`.

package/src/JBOmnichainDeployer.sol

@@ -22,6 +22,7 @@ import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {IJBPeerChainAdjustedAccounts} from "@bananapus/suckers-v6/src/interfaces/IJBPeerChainAdjustedAccounts.sol";
 import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerRegistry.sol";
+import {JBPeerChainAdjustedAccountsLib} from "@bananapus/suckers-v6/src/libraries/JBPeerChainAdjustedAccountsLib.sol";
 import {JBSourceContext} from "@bananapus/suckers-v6/src/structs/JBSourceContext.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
@@ -557,7 +558,8 @@ contract JBOmnichainDeployer is
                 // When issueTokensForSplits is true and splits exist, this holds the weight portion
                 // attributable to tier splits — used to prevent split credit erasure if the extra
                 // hook (e.g. buyback) returns weight=0.
-                if (tiered721HookSpec.metadata.length >= 128) {
+                // The tuple's minimum ABI encoding is 160 bytes: 4 head words plus an empty `bytes` tail.
+                if (tiered721HookSpec.metadata.length >= 160) {
                     (,,, splitCreditWeight) = abi.decode(tiered721HookSpec.metadata, (address, address, bytes, uint256));
                 }
             }
@@ -709,12 +711,9 @@ contract JBOmnichainDeployer is
         (bool success, bytes memory data) = address(extraHook.dataHook)
             .staticcall(abi.encodeCall(IJBPeerChainAdjustedAccounts.peerChainAdjustedAccountsOf, (projectId)));
 
-        // A well-formed `(uint256, JBSourceContext[])` return is at least three words: the supply, the array offset,
-        // and the array length. Anything shorter (an empty return, a hook with no code, or a mismatched ABI) is
-        // treated as no contribution rather than letting the decode revert.
-        if (!success || data.length < 96) return (0, new JBSourceContext[](0));
+        if (!success) return (0, new JBSourceContext[](0));
 
-        return abi.decode(data, (uint256, JBSourceContext[]));
+        return JBPeerChainAdjustedAccountsLib.decode(data);
     }
 
     //*********************************************************************//