@buildonspark/spark-sdk 0.2.3 → 0.2.4

package/src/graphql/objects/RequestLeavesSwapInput.ts

@@ -1,63 +1,64 @@
-
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
-
-import {UserLeafInputFromJson} from './UserLeafInput.js';
-import {UserLeafInputToJson} from './UserLeafInput.js';
-import UserLeafInput from './UserLeafInput.js';
-
+import UserLeafInput, {
+  UserLeafInputFromJson,
+  UserLeafInputToJson,
+} from "./UserLeafInput.js";
 
 interface RequestLeavesSwapInput {
+  adaptorPubkey: string;
 
+  directAdaptorPubkey?: string;
 
-    adaptorPubkey: string;
-
-    totalAmountSats: number;
-
-    targetAmountSats: number;
-
-    feeSats: number;
-
-    userLeaves: UserLeafInput[];
-
-    idempotencyKey: string;
+  directFromCpfpAdaptorPubkey?: string;
 
-    targetAmountSatsList?: number[] | undefined;
+  totalAmountSats: number;
 
+  targetAmountSats: number;
 
+  feeSats: number;
 
+  userLeaves: UserLeafInput[];
 
-}
-
-export const RequestLeavesSwapInputFromJson = (obj: any): RequestLeavesSwapInput => {
-    return {
-        adaptorPubkey: obj["request_leaves_swap_input_adaptor_pubkey"],
-        totalAmountSats: obj["request_leaves_swap_input_total_amount_sats"],
-        targetAmountSats: obj["request_leaves_swap_input_target_amount_sats"],
-        feeSats: obj["request_leaves_swap_input_fee_sats"],
-        userLeaves: obj["request_leaves_swap_input_user_leaves"].map((e) => UserLeafInputFromJson(e)),
-        idempotencyKey: obj["request_leaves_swap_input_idempotency_key"],
-        targetAmountSatsList: obj["request_leaves_swap_input_target_amount_sats_list"],
-
-        } as RequestLeavesSwapInput;
-
-}
-export const RequestLeavesSwapInputToJson = (obj: RequestLeavesSwapInput): any => {
-return {
-request_leaves_swap_input_adaptor_pubkey: obj.adaptorPubkey,
-request_leaves_swap_input_total_amount_sats: obj.totalAmountSats,
-request_leaves_swap_input_target_amount_sats: obj.targetAmountSats,
-request_leaves_swap_input_fee_sats: obj.feeSats,
-request_leaves_swap_input_user_leaves: obj.userLeaves.map((e) => UserLeafInputToJson(e)),
-request_leaves_swap_input_idempotency_key: obj.idempotencyKey,
-request_leaves_swap_input_target_amount_sats_list: obj.targetAmountSatsList,
-
-        }
+  idempotencyKey: string;
 
+  targetAmountSatsList?: number[] | undefined;
 }
 
-
-
-
+export const RequestLeavesSwapInputFromJson = (
+  obj: any,
+): RequestLeavesSwapInput => {
+  return {
+    adaptorPubkey: obj["request_leaves_swap_input_adaptor_pubkey"],
+    directAdaptorPubkey: obj["request_leaves_swap_input_direct_adaptor_pubkey"],
+    directFromCpfpAdaptorPubkey: obj["request_leaves_swap_input_direct_from_cpfp_adaptor_pubkey"],
+    totalAmountSats: obj["request_leaves_swap_input_total_amount_sats"],
+    targetAmountSats: obj["request_leaves_swap_input_target_amount_sats"],
+    feeSats: obj["request_leaves_swap_input_fee_sats"],
+    userLeaves: obj["request_leaves_swap_input_user_leaves"].map((e) =>
+      UserLeafInputFromJson(e),
+    ),
+    idempotencyKey: obj["request_leaves_swap_input_idempotency_key"],
+    targetAmountSatsList:
+      obj["request_leaves_swap_input_target_amount_sats_list"],
+  } as RequestLeavesSwapInput;
+};
+export const RequestLeavesSwapInputToJson = (
+  obj: RequestLeavesSwapInput,
+): any => {
+  return {
+    request_leaves_swap_input_adaptor_pubkey: obj.adaptorPubkey,
+    request_leaves_swap_input_direct_adaptor_pubkey: obj.directAdaptorPubkey,
+    request_leaves_swap_input_direct_from_cpfp_adaptor_pubkey: obj.directFromCpfpAdaptorPubkey,
+    request_leaves_swap_input_total_amount_sats: obj.totalAmountSats,
+    request_leaves_swap_input_target_amount_sats: obj.targetAmountSats,
+    request_leaves_swap_input_fee_sats: obj.feeSats,
+    request_leaves_swap_input_user_leaves: obj.userLeaves.map((e) =>
+      UserLeafInputToJson(e),
+    ),
+    request_leaves_swap_input_idempotency_key: obj.idempotencyKey,
+    request_leaves_swap_input_target_amount_sats_list: obj.targetAmountSatsList,
+  };
+};
 
 export default RequestLeavesSwapInput;

package/src/graphql/objects/SwapLeaf.ts

@@ -1,53 +1,61 @@
-
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
-
-
-
-
 interface SwapLeaf {
+  leafId: string;
 
+  rawUnsignedRefundTransaction: string;
 
-    leafId: string;
-
-    rawUnsignedRefundTransaction: string;
-
-    adaptorSignedSignature: string;
+  adaptorSignedSignature: string;
 
+  directRawUnsignedRefundTransaction?: string;
 
+  directAdaptorSignedSignature?: string;
 
+  directFromCpfpRawUnsignedRefundTransaction?: string;
 
+  directFromCpfpAdaptorSignedSignature?: string;
 }
 
 export const SwapLeafFromJson = (obj: any): SwapLeaf => {
-    return {
-        leafId: obj["swap_leaf_leaf_id"],
-        rawUnsignedRefundTransaction: obj["swap_leaf_raw_unsigned_refund_transaction"],
-        adaptorSignedSignature: obj["swap_leaf_adaptor_signed_signature"],
-
-        } as SwapLeaf;
-
-}
+  return {
+    leafId: obj["swap_leaf_leaf_id"],
+    rawUnsignedRefundTransaction:
+      obj["swap_leaf_raw_unsigned_refund_transaction"],
+    adaptorSignedSignature: obj["swap_leaf_adaptor_signed_signature"],
+    directRawUnsignedRefundTransaction:
+      obj["swap_leaf_direct_raw_unsigned_refund_transaction"],
+    directAdaptorSignedSignature:
+      obj["swap_leaf_direct_adaptor_signed_signature"],
+    directFromCpfpRawUnsignedRefundTransaction:
+      obj["swap_leaf_direct_from_cpfp_raw_unsigned_refund_transaction"],
+    directFromCpfpAdaptorSignedSignature:
+      obj["swap_leaf_direct_from_cpfp_adaptor_signed_signature"], 
+  } as SwapLeaf;
+};
 export const SwapLeafToJson = (obj: SwapLeaf): any => {
-return {
-swap_leaf_leaf_id: obj.leafId,
-swap_leaf_raw_unsigned_refund_transaction: obj.rawUnsignedRefundTransaction,
-swap_leaf_adaptor_signed_signature: obj.adaptorSignedSignature,
-
-        }
-
-}
-
-
-    export const FRAGMENT = `
+  return {
+    swap_leaf_leaf_id: obj.leafId,
+    swap_leaf_raw_unsigned_refund_transaction: obj.rawUnsignedRefundTransaction,
+    swap_leaf_adaptor_signed_signature: obj.adaptorSignedSignature,
+    swap_leaf_direct_raw_unsigned_refund_transaction:
+      obj.directRawUnsignedRefundTransaction,
+    swap_leaf_direct_adaptor_signed_signature: obj.directAdaptorSignedSignature,
+    swap_leaf_direct_from_cpfp_raw_unsigned_refund_transaction:
+    obj.directFromCpfpRawUnsignedRefundTransaction,
+  swap_leaf_direct_from_cpfp_adaptor_signed_signature: obj.directFromCpfpAdaptorSignedSignature,
+  };
+};
+
+export const FRAGMENT = `
 fragment SwapLeafFragment on SwapLeaf {
     __typename
     swap_leaf_leaf_id: leaf_id
     swap_leaf_raw_unsigned_refund_transaction: raw_unsigned_refund_transaction
     swap_leaf_adaptor_signed_signature: adaptor_signed_signature
+    swap_leaf_direct_raw_unsigned_refund_transaction: direct_raw_unsigned_refund_transaction
+    swap_leaf_direct_adaptor_signed_signature: direct_adaptor_signed_signature
+    swap_leaf_direct_from_cpfp_raw_unsigned_refund_transaction: direct_from_cpfp_raw_unsigned_refund_transaction
+    swap_leaf_direct_from_cpfp_adaptor_signed_signature: direct_from_cpfp_adaptor_signed_signature
 }`;
 
-
-
-
 export default SwapLeaf;

package/src/graphql/objects/UserLeafInput.ts

@@ -5,7 +5,15 @@ interface UserLeafInput {
 
   raw_unsigned_refund_transaction: string;
 
+  direct_raw_unsigned_refund_transaction: string;
+
+  direct_from_cpfp_raw_unsigned_refund_transaction: string;
+
   adaptor_added_signature: string;
+
+  direct_adaptor_added_signature: string;
+
+  direct_from_cpfp_adaptor_added_signature: string;
 }
 
 export const UserLeafInputFromJson = (obj: any): UserLeafInput => {
@@ -13,7 +21,15 @@ export const UserLeafInputFromJson = (obj: any): UserLeafInput => {
     leaf_id: obj["user_leaf_input_leaf_id"],
     raw_unsigned_refund_transaction:
       obj["user_leaf_input_raw_unsigned_refund_transaction"],
+    direct_raw_unsigned_refund_transaction:
+      obj["user_leaf_input_direct_raw_unsigned_refund_transaction"],
+    direct_from_cpfp_raw_unsigned_refund_transaction:
+      obj["user_leaf_input_direct_from_cpfp_unsigned_refund_transaction"],
     adaptor_added_signature: obj["user_leaf_input_adaptor_added_signature"],
+    direct_adaptor_added_signature:
+      obj["user_leaf_input_direct_adaptor_added_signature"],
+    direct_from_cpfp_adaptor_added_signature:
+      obj["user_leaf_input_direct_from_cpfp_adaptor_added_signature"],
   } as UserLeafInput;
 };
 export const UserLeafInputToJson = (obj: UserLeafInput): any => {
@@ -21,7 +37,15 @@ export const UserLeafInputToJson = (obj: UserLeafInput): any => {
     user_leaf_input_leaf_id: obj.leaf_id,
     user_leaf_input_raw_unsigned_refund_transaction:
       obj.raw_unsigned_refund_transaction,
+    user_leaf_input_direct_raw_unsigned_refund_transaction:
+      obj.direct_raw_unsigned_refund_transaction,
+    user_leaf_input_direct_from_cpfp_raw_unsigned_refund_transaction:
+      obj.direct_from_cpfp_raw_unsigned_refund_transaction,
     user_leaf_input_adaptor_added_signature: obj.adaptor_added_signature,
+    user_leaf_input_direct_adaptor_added_signature:
+      obj.direct_adaptor_added_signature,
+    user_leaf_input_direct_from_cpfp_adaptor_added_signature:
+      obj.direct_from_cpfp_adaptor_added_signature,
   };
 };
 

package/src/graphql/objects/UserRequest.ts

@@ -448,6 +448,10 @@ fragment UserRequestFragment on UserRequest {
             swap_leaf_leaf_id: leaf_id
             swap_leaf_raw_unsigned_refund_transaction: raw_unsigned_refund_transaction
             swap_leaf_adaptor_signed_signature: adaptor_signed_signature
+            swap_leaf_direct_raw_unsigned_refund_transaction: direct_raw_unsigned_refund_transaction
+            swap_leaf_direct_adaptor_signed_signature: direct_adaptor_signed_signature
+            swap_leaf_direct_from_cpfp_raw_unsigned_refund_transaction: direct_from_cpfp_raw_unsigned_refund_transaction
+            swap_leaf_direct_from_cpfp_adaptor_signed_signature: direct_from_cpfp_adaptor_signed_signature
         }
     }
     ... on LightningReceiveRequest {

package/src/index.node.ts

@@ -21,7 +21,7 @@ export {
 } from "./signer/signer.js";
 export * from "./signer/types.js";
 
-export { SparkWallet } from "./spark-wallet/spark-wallet.js";
+export { SparkWallet } from "./spark-wallet/spark-wallet.node.js";
 export * from "./spark-wallet/types.js";
 
 export { type WalletConfigService } from "./services/config.js";

package/src/native/index.ts

@@ -1,6 +1,6 @@
 /* Root React Native entrypoint */
 
-import { setCrypto, SparkCrypto } from "../utils/crypto.js";
+import { setCrypto } from "../utils/crypto.js";
 
 setCrypto(globalThis.crypto);
 
@@ -14,8 +14,7 @@ export { ReactNativeSparkSigner as DefaultSparkSigner } from "../signer/signer.r
 export { SparkWallet } from "../spark-wallet/spark-wallet.js";
 export * from "../spark-wallet/types.js";
 
-export { WalletConfig } from "../services/wallet-config.js";
-export { TokenTransactionService } from "../services/token-transactions.js";
-export { type ConnectionManager } from "../services/connection.js";
 export { type WalletConfigService } from "../services/config.js";
-export { type ConfigOptions } from "../services/wallet-config.js";
+export { type ConnectionManager } from "../services/connection.js";
+export { TokenTransactionService } from "../services/token-transactions.js";
+export { WalletConfig, type ConfigOptions } from "../services/wallet-config.js";

package/src/services/coop-exit.ts

@@ -12,7 +12,10 @@ import {
   getTxFromRawTxBytes,
 } from "../utils/bitcoin.js";
 import { Network } from "../utils/network.js";
-import { getNextTransactionSequence } from "../utils/transaction.js";
+import {
+  getNextTransactionSequence,
+  maybeApplyFee,
+} from "../utils/transaction.js";
 import { WalletConfigService } from "./config.js";
 import { ConnectionManager } from "./connection.js";
 import { SigningService } from "./signing.js";
@@ -43,8 +46,15 @@ export class CoopExitService extends BaseTransferService {
   }: GetConnectorRefundSignaturesParams): Promise<{
     transfer: Transfer;
     signaturesMap: Map<string, Uint8Array>;
+    directSignaturesMap: Map<string, Uint8Array>;
+    directFromCpfpSignaturesMap: Map<string, Uint8Array>;
   }> {
-    const { transfer, signaturesMap } = await this.signCoopExitRefunds(
+    const {
+      transfer,
+      signaturesMap,
+      directSignaturesMap,
+      directFromCpfpSignaturesMap,
+    } = await this.signCoopExitRefunds(
       leaves,
       exitTxId,
       connectorOutputs,
@@ -55,51 +65,116 @@ export class CoopExitService extends BaseTransferService {
       transfer,
       leaves,
       signaturesMap,
+      directSignaturesMap,
+      directFromCpfpSignaturesMap,
     );
 
-    return { transfer: transferTweak, signaturesMap };
+    return {
+      transfer: transferTweak,
+      signaturesMap,
+      directSignaturesMap,
+      directFromCpfpSignaturesMap,
+    };
   }
 
-  private createConnectorRefundTransaction(
+  private createConnectorRefundTransactions(
     sequence: number,
-    nodeOutPoint: TransactionInput,
+    directSequence: number,
+    cpfpNodeOutPoint: TransactionInput,
+    directNodeOutPoint: TransactionInput | undefined,
     connectorOutput: TransactionInput,
     amountSats: bigint,
     receiverPubKey: Uint8Array,
-  ): Transaction {
-    const refundTx = new Transaction();
-    if (!nodeOutPoint.txid || nodeOutPoint.index === undefined) {
-      throw new ValidationError("Invalid node outpoint", {
-        field: "nodeOutPoint",
-        value: { txid: nodeOutPoint.txid, index: nodeOutPoint.index },
+  ): {
+    cpfpRefundTx: Transaction;
+    directRefundTx?: Transaction;
+    directFromCpfpRefundTx?: Transaction;
+  } {
+    // Create CPFP refund transaction
+    const cpfpRefundTx = new Transaction();
+    if (!cpfpNodeOutPoint.txid || cpfpNodeOutPoint.index === undefined) {
+      throw new ValidationError("Invalid CPFP node outpoint", {
+        field: "cpfpNodeOutPoint",
+        value: { txid: cpfpNodeOutPoint.txid, index: cpfpNodeOutPoint.index },
         expected: "Both txid and index must be defined",
       });
     }
-    refundTx.addInput({
-      txid: nodeOutPoint.txid,
-      index: nodeOutPoint.index,
+    cpfpRefundTx.addInput({
+      txid: cpfpNodeOutPoint.txid,
+      index: cpfpNodeOutPoint.index,
       sequence,
     });
 
-    refundTx.addInput(connectorOutput);
+    cpfpRefundTx.addInput(connectorOutput);
     const receiverScript = getP2TRScriptFromPublicKey(
       receiverPubKey,
       this.config.getNetwork(),
     );
 
-    refundTx.addOutput({
+    cpfpRefundTx.addOutput({
       script: receiverScript,
       amount: amountSats,
     });
 
-    return refundTx;
+    // Create direct refund transaction
+    let directRefundTx: Transaction | undefined;
+    let directFromCpfpRefundTx: Transaction | undefined;
+    if (directNodeOutPoint) {
+      if (!directNodeOutPoint.txid || directNodeOutPoint.index === undefined) {
+        throw new ValidationError("Invalid direct node outpoint", {
+          field: "directNodeOutPoint",
+          value: {
+            txid: directNodeOutPoint.txid,
+            index: directNodeOutPoint.index,
+          },
+          expected: "Both txid and index must be defined",
+        });
+      }
+      directRefundTx = new Transaction();
+      directRefundTx.addInput({
+        txid: directNodeOutPoint.txid,
+        index: directNodeOutPoint.index,
+        sequence: directSequence,
+      });
+
+      directRefundTx.addInput(connectorOutput);
+      directRefundTx.addOutput({
+        script: receiverScript,
+        amount: maybeApplyFee(amountSats),
+      });
+
+      directFromCpfpRefundTx = new Transaction();
+      directFromCpfpRefundTx.addInput({
+        txid: cpfpNodeOutPoint.txid,
+        index: cpfpNodeOutPoint.index,
+        sequence: directSequence,
+      });
+
+      directFromCpfpRefundTx.addInput(connectorOutput);
+      directFromCpfpRefundTx.addOutput({
+        script: receiverScript,
+        amount: maybeApplyFee(amountSats),
+      });
+    }
+
+    return {
+      cpfpRefundTx,
+      directRefundTx,
+      directFromCpfpRefundTx,
+    };
   }
+
   private async signCoopExitRefunds(
     leaves: LeafKeyTweak[],
     exitTxId: Uint8Array,
     connectorOutputs: TransactionInput[],
     receiverPubKey: Uint8Array,
-  ): Promise<{ transfer: Transfer; signaturesMap: Map<string, Uint8Array> }> {
+  ): Promise<{
+    transfer: Transfer;
+    signaturesMap: Map<string, Uint8Array>;
+    directSignaturesMap: Map<string, Uint8Array>;
+    directFromCpfpSignaturesMap: Map<string, Uint8Array>;
+  }> {
     if (leaves.length !== connectorOutputs.length) {
       throw new ValidationError(
         "Mismatch between leaves and connector outputs",
@@ -136,43 +211,88 @@ export class CoopExitService extends BaseTransferService {
       }
       const currentRefundTx = getTxFromRawTxBytes(leaf.leaf.refundTx);
 
-      const { nextSequence } = getNextTransactionSequence(
-        currentRefundTx.getInput(0).sequence,
-      );
+      const sequence = currentRefundTx.getInput(0).sequence;
+      if (!sequence) {
+        throw new ValidationError("Invalid refund transaction", {
+          field: "sequence",
+          value: currentRefundTx.getInput(0),
+          expected: "Non-null sequence",
+        });
+      }
+      const { nextSequence, nextDirectSequence } =
+        getNextTransactionSequence(sequence);
 
-      const refundTx = this.createConnectorRefundTransaction(
-        nextSequence,
-        currentRefundTx.getInput(0),
-        connectorOutput,
-        BigInt(leaf.leaf.value),
-        receiverPubKey,
-      );
+      let currentDirectRefundTx: Transaction | undefined;
+      if (leaf.leaf.directRefundTx.length > 0) {
+        currentDirectRefundTx = getTxFromRawTxBytes(leaf.leaf.directRefundTx);
+      }
+
+      const { cpfpRefundTx, directRefundTx, directFromCpfpRefundTx } =
+        this.createConnectorRefundTransactions(
+          nextSequence,
+          nextDirectSequence,
+          currentRefundTx.getInput(0),
+          currentDirectRefundTx?.getInput(0),
+          connectorOutput,
+          BigInt(leaf.leaf.value),
+          receiverPubKey,
+        );
 
       const signingNonceCommitment =
         await this.config.signer.getRandomSigningCommitment();
+      const directSigningNonceCommitment =
+        await this.config.signer.getRandomSigningCommitment();
+      const directFromCpfpSigningNonceCommitment =
+        await this.config.signer.getRandomSigningCommitment();
+      const signingPublicKey =
+        await this.config.signer.getPublicKeyFromDerivation(leaf.keyDerivation);
+
       const signingJob: LeafRefundTxSigningJob = {
         leafId: leaf.leaf.id,
         refundTxSigningJob: {
           signingPublicKey: await this.config.signer.getPublicKeyFromDerivation(
             leaf.keyDerivation,
           ),
-          rawTx: refundTx.toBytes(),
+          rawTx: cpfpRefundTx.toBytes(),
           signingNonceCommitment: signingNonceCommitment.commitment,
         },
-        // TODO: Add direct refund signature
-        directRefundTxSigningJob: undefined,
-        directFromCpfpRefundTxSigningJob: undefined,
+        directRefundTxSigningJob: directRefundTx
+          ? {
+              signingPublicKey,
+              rawTx: directRefundTx.toBytes(),
+              signingNonceCommitment: directSigningNonceCommitment.commitment,
+            }
+          : undefined,
+        directFromCpfpRefundTxSigningJob: directFromCpfpRefundTx
+          ? {
+              signingPublicKey,
+              rawTx: directFromCpfpRefundTx.toBytes(),
+              signingNonceCommitment:
+                directFromCpfpSigningNonceCommitment.commitment,
+            }
+          : undefined,
       };
 
       signingJobs.push(signingJob);
       const tx = getTxFromRawTxBytes(leaf.leaf.nodeTx);
+      const directTx =
+        leaf.leaf.directTx.length > 0
+          ? getTxFromRawTxBytes(leaf.leaf.directTx)
+          : undefined;
+
       leafDataMap.set(leaf.leaf.id, {
         keyDerivation: leaf.keyDerivation,
-        refundTx,
+        receivingPubkey: receiverPubKey,
         signingNonceCommitment,
+        directSigningNonceCommitment,
         tx,
+        directTx,
+        refundTx: cpfpRefundTx,
+        directRefundTx: directRefundTx,
+        directFromCpfpRefundTx: directFromCpfpRefundTx,
+        directFromCpfpRefundSigningNonceCommitment:
+          directFromCpfpSigningNonceCommitment,
         vout: leaf.leaf.vout,
-        receivingPubkey: receiverPubKey,
       });
     }
 
@@ -182,7 +302,7 @@ export class CoopExitService extends BaseTransferService {
 
     let response: CooperativeExitResponse;
     try {
-      response = await sparkClient.cooperative_exit({
+      response = await sparkClient.cooperative_exit_v2({
         transfer: {
           transferId: uuidv7(),
           leavesToSend: signingJobs,
@@ -222,10 +342,25 @@ export class CoopExitService extends BaseTransferService {
     );
 
     const signaturesMap: Map<string, Uint8Array> = new Map();
+    const directSignaturesMap: Map<string, Uint8Array> = new Map();
+    const directFromCpfpSignaturesMap: Map<string, Uint8Array> = new Map();
     for (const signature of signatures) {
       signaturesMap.set(signature.nodeId, signature.refundTxSignature);
+      directSignaturesMap.set(
+        signature.nodeId,
+        signature.directRefundTxSignature,
+      );
+      directFromCpfpSignaturesMap.set(
+        signature.nodeId,
+        signature.directFromCpfpRefundTxSignature,
+      );
     }
 
-    return { transfer: response.transfer, signaturesMap };
+    return {
+      transfer: response.transfer,
+      signaturesMap,
+      directSignaturesMap,
+      directFromCpfpSignaturesMap,
+    };
   }
 }