@hazbase/simplicity 0.4.5 → 0.4.6

package/README.md

@@ -242,6 +242,13 @@ These helpers model a Liquidex-style exchange:
 - the resulting `X-PAYMENT` payload commits to both the payment output and the
   delivery output through a summary hash
 
+When the delivered RWA output must go to a policy/Simplicity address instead of
+the taker's normal wallet receive address, pass `takerDeliveryAddress` (or the
+`deliveryAddress` alias) to `prepareLiquidAtomicDvpLwkWasmTakerPayment(...)`.
+The loaded LWK module must expose a recipient-aware `liquidexTake` variant; if
+it does not, the SDK fails explicitly instead of silently creating a PSET that
+delivers to the wrong address.
+
 The LWK convenience helpers dynamically load `lwk_node` or `lwk_wasm` from the
 consuming application. Install one of them in the application that prepares or
 takes proposals:

package/dist/core/executor.js

@@ -445,12 +445,19 @@ function filterContractUtxosByRequestedAsset(utxos, input) {
     if (!input)
         return utxos;
     return utxos.filter((utxo) => {
+        const matchesRequestedOutpoint = Boolean(input.txid
+            && utxo.txid === input.txid
+            && (input.vout === undefined || utxo.vout === input.vout));
         if (input.txid && utxo.txid !== input.txid)
             return false;
         if (input.vout !== undefined && utxo.vout !== input.vout)
             return false;
-        if (input.asset && normalizeAssetId(utxo.asset) !== normalizeAssetId(input.asset))
-            return false;
+        if (input.asset) {
+            if (!utxo.asset)
+                return matchesRequestedOutpoint;
+            if (normalizeAssetId(utxo.asset) !== normalizeAssetId(input.asset))
+                return false;
+        }
         if (input.amountSat !== undefined && utxo.sat !== input.amountSat)
             return false;
         return true;

package/dist/x402/atomicDvp.d.ts

@@ -137,6 +137,16 @@ export interface LiquidAtomicDvpTakeProposalInput {
     proposal?: string;
     proposalPsetBase64?: string;
     proposalTxHex?: string;
+    /**
+     * Optional recipient for the maker-delivered asset when the taker PSET is
+     * completed. Use this for policy/Simplicity delivery addresses that are not a
+     * normal wallet receive address.
+     */
+    takerDeliveryAddress?: string;
+    /**
+     * Backwards-friendly alias for `takerDeliveryAddress`.
+     */
+    deliveryAddress?: string;
     payer?: string;
     esploraUrl?: string;
     waterfalls?: boolean;
@@ -154,6 +164,7 @@ export type LiquidAtomicDvpTakeProposalResult = ReturnType<typeof buildLiquidAto
     dwid?: string;
     proposalInput: LiquidAtomicDvpOutputRequirement;
     proposalOutput: LiquidAtomicDvpOutputRequirement;
+    takerDeliveryAddress?: string;
 };
 export interface LiquidAtomicDvpVerifyPayloadResult {
     isValid: boolean;

package/dist/x402/atomicDvp.js

@@ -113,7 +113,8 @@ async function prepareLiquidAtomicDvpLwkWasmTakerPayment(input) {
     let builder = network.txBuilder();
     if (input.feeRate !== undefined)
         builder = builder.feeRate(input.feeRate);
-    builder = builder.liquidexTake([validated]);
+    const takerDeliveryAddress = normalizeOptionalString(input.takerDeliveryAddress ?? input.deliveryAddress, "takerDeliveryAddress");
+    builder = applyLiquidexTake(lwk, builder, [validated], network, takerDeliveryAddress);
     const unsigned = builder.finish(wollet);
     const signed = signer.sign(unsigned);
     const pset = input.finalize === false ? signed : wollet.finalize(signed);
@@ -128,6 +129,7 @@ async function prepareLiquidAtomicDvpLwkWasmTakerPayment(input) {
         ...(typeof wollet.dwid === "function" ? { dwid: wollet.dwid() } : {}),
         proposalInput,
         proposalOutput,
+        ...(takerDeliveryAddress ? { takerDeliveryAddress } : {}),
     };
 }
 function buildLiquidAtomicDvpSummaryHash(input) {
@@ -360,6 +362,18 @@ function parseLwkTransaction(lwk, txHex) {
         return new lwk.Transaction(txHex);
     throw new Error("LWK Transaction support is required to validate a Liquidex proposal against a transaction.");
 }
+function applyLiquidexTake(lwk, builder, validatedProposals, network, takerDeliveryAddress) {
+    if (!takerDeliveryAddress)
+        return builder.liquidexTake(validatedProposals);
+    const deliveryAddress = parseLwkAddress(lwk, takerDeliveryAddress, network);
+    for (const method of ["liquidexTakeWithRecipient", "liquidexTakeToAddress", "liquidexTakeTo"]) {
+        if (typeof builder[method] === "function") {
+            return builder[method](validatedProposals, deliveryAddress);
+        }
+    }
+    throw new Error("Liquidex taker delivery address override is not supported by the loaded LWK module. " +
+        "Upgrade LWK or use a fixed-recipient/manual atomic DvP PSET builder.");
+}
 function parseLiquidexProposal(lwk, value) {
     const encoded = String(value ?? "").trim();
     if (!encoded)
@@ -435,6 +449,16 @@ function normalizeOutput(value, name) {
         recipient: requiredString(raw.recipient, `${name}.recipient`),
     };
 }
+function normalizeOptionalString(value, name) {
+    if (value === undefined || value === null)
+        return undefined;
+    const text = String(value).trim();
+    if (!text)
+        return undefined;
+    if (text.length > 2048)
+        throw new Error(`${name} is too long`);
+    return text;
+}
 function normalizeServiceSigner(value) {
     if (value === null || value === undefined)
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hazbase/simplicity",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "An SDK for Simplicity on Liquid",
   "author": "IndieSquare Inc <info@hazbase.com>",
   "keywords": [