uvd-x402-sdk 2.11.1 → 2.12.0

package/dist/providers/algorand/index.mjs

@@ -877,11 +877,13 @@ var AlgorandProvider = class {
     }
   }
   /**
-   * Create Algorand ASA transfer payment
+   * Create Algorand atomic group payment (GoPlausible x402-avm spec)
    *
-   * Transaction structure:
-   * 1. ASA Transfer from user to recipient
-   * 2. Facilitator pays transaction fees
+   * Transaction structure (atomic group):
+   * - Transaction 0: Fee payment (UNSIGNED) - facilitator -> facilitator, covers all fees
+   * - Transaction 1: ASA transfer (SIGNED) - client -> merchant
+   *
+   * The facilitator signs transaction 0 and submits the complete atomic group.
    */
   async signPayment(paymentInfo, chainConfig) {
     await loadAlgorandDeps();
@@ -894,40 +896,85 @@ var AlgorandProvider = class {
     const algodClient = await this.getAlgodClient(chainConfig);
     const recipient = paymentInfo.recipients?.algorand || paymentInfo.recipient;
     const assetId = parseInt(chainConfig.usdc.address, 10);
+    const facilitatorAddress = paymentInfo.facilitator;
+    if (!facilitatorAddress) {
+      throw new X402Error(
+        "Facilitator address required for Algorand payments. Set paymentInfo.facilitator",
+        "PAYMENT_FAILED"
+      );
+    }
     const amount = Math.floor(parseFloat(paymentInfo.amount) * 1e6);
     try {
       const suggestedParams = await algodClient.getTransactionParams().do();
-      const txn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
+      const feeTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
+        sender: facilitatorAddress,
+        receiver: facilitatorAddress,
+        // self-transfer
+        amount: 0,
+        suggestedParams: {
+          ...suggestedParams,
+          fee: 2e3,
+          // Covers both transactions (1000 each)
+          flatFee: true
+        }
+      });
+      const paymentTxn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
         sender: this.address,
         receiver: recipient,
         amount: BigInt(amount),
         assetIndex: assetId,
-        suggestedParams,
+        suggestedParams: {
+          ...suggestedParams,
+          fee: 0,
+          // Fee paid by transaction 0
+          flatFee: true
+        },
         note: new TextEncoder().encode("x402 payment via uvd-x402-sdk")
       });
-      let signedTxn;
+      const txnGroup = algosdk.assignGroupID([feeTxn, paymentTxn]);
+      const unsignedFeeTxnBytes = algosdk.encodeUnsignedTransaction(txnGroup[0]);
+      const unsignedFeeTxnBase64 = uint8ArrayToBase64(unsignedFeeTxnBytes);
+      let signedPaymentTxnBytes;
       if (this.walletType === "lute" && this.luteWallet) {
-        const txnBase64 = uint8ArrayToBase64(txn.toByte());
-        const signedTxns = await this.luteWallet.signTxns([{ txn: txnBase64 }]);
-        if (!signedTxns || signedTxns.length === 0 || !signedTxns[0]) {
+        const feeTxnBase64 = uint8ArrayToBase64(txnGroup[0].toByte());
+        const paymentTxnBase64 = uint8ArrayToBase64(txnGroup[1].toByte());
+        const signedTxns = await this.luteWallet.signTxns([
+          { txn: feeTxnBase64, signers: [] },
+          // Don't sign - facilitator will
+          { txn: paymentTxnBase64 }
+          // Sign this one
+        ]);
+        if (!signedTxns || signedTxns.length < 2 || !signedTxns[1]) {
           throw new X402Error("No signed transaction returned", "SIGNATURE_REJECTED");
         }
-        signedTxn = Uint8Array.from(atob(signedTxns[0]), (c) => c.charCodeAt(0));
+        const signedResult = signedTxns[1];
+        signedPaymentTxnBytes = this.decodeSignedTxn(signedResult);
       } else if (this.walletType === "pera" && this.peraWallet) {
-        const signedTxns = await this.peraWallet.signTransaction([[{ txn }]]);
-        if (!signedTxns || signedTxns.length === 0) {
+        const signedTxns = await this.peraWallet.signTransaction([
+          [
+            { txn: txnGroup[0], signers: [] },
+            // Don't sign - facilitator will
+            { txn: txnGroup[1] }
+            // Sign this one
+          ]
+        ]);
+        if (!signedTxns || signedTxns.length < 2 || !signedTxns[1]) {
           throw new X402Error("No signed transaction returned", "SIGNATURE_REJECTED");
         }
-        signedTxn = signedTxns[0];
+        signedPaymentTxnBytes = signedTxns[1];
       } else {
         throw new X402Error("No wallet available for signing", "WALLET_NOT_CONNECTED");
       }
+      const signedPaymentTxnBase64 = uint8ArrayToBase64(signedPaymentTxnBytes);
       const payload = {
-        from: this.address,
-        to: recipient,
-        amount: amount.toString(),
-        assetId,
-        signedTxn: uint8ArrayToBase64(signedTxn)
+        paymentIndex: 1,
+        // Index of the payment transaction in the group
+        paymentGroup: [
+          unsignedFeeTxnBase64,
+          // Transaction 0: unsigned fee tx
+          signedPaymentTxnBase64
+          // Transaction 1: signed payment tx
+        ]
       };
       return JSON.stringify(payload);
     } catch (error) {
@@ -946,6 +993,29 @@ var AlgorandProvider = class {
       );
     }
   }
+  /**
+   * Decode signed transaction from wallet response (handles various formats)
+   */
+  decodeSignedTxn(signedResult) {
+    if (signedResult instanceof Uint8Array) {
+      return signedResult;
+    } else if (typeof signedResult === "string") {
+      try {
+        return Uint8Array.from(atob(signedResult), (c) => c.charCodeAt(0));
+      } catch {
+        const standardBase64 = signedResult.replace(/-/g, "+").replace(/_/g, "/");
+        return Uint8Array.from(atob(standardBase64), (c) => c.charCodeAt(0));
+      }
+    } else if (ArrayBuffer.isView(signedResult)) {
+      return new Uint8Array(
+        signedResult.buffer,
+        signedResult.byteOffset,
+        signedResult.byteLength
+      );
+    } else {
+      throw new X402Error("Unexpected signed transaction format", "PAYMENT_FAILED");
+    }
+  }
   /**
    * Encode Algorand payment as X-PAYMENT header
    *
@@ -956,14 +1026,15 @@ var AlgorandProvider = class {
    */
   encodePaymentHeader(paymentPayload, chainConfig, version = 1) {
     const payload = JSON.parse(paymentPayload);
-    const networkName = chainConfig?.name || "algorand";
+    let networkName;
+    if (chainConfig?.name === "algorand-testnet") {
+      networkName = "algorand-testnet";
+    } else {
+      networkName = "algorand-mainnet";
+    }
     const payloadData = {
-      from: payload.from,
-      to: payload.to,
-      amount: payload.amount,
-      assetId: payload.assetId,
-      signedTxn: payload.signedTxn,
-      ...payload.note && { note: payload.note }
+      paymentIndex: payload.paymentIndex,
+      paymentGroup: payload.paymentGroup
     };
     const x402Payload = version === 2 ? {
       x402Version: 2,
@@ -975,7 +1046,6 @@ var AlgorandProvider = class {
       x402Version: 1,
       scheme: "exact",
       network: networkName,
-      // Plain chain name for v1
       payload: payloadData
     };
     return btoa(JSON.stringify(x402Payload));