@buildonspark/spark-sdk 0.2.2 → 0.2.4

package/src/graphql/client.ts

@@ -309,6 +309,8 @@ export default class SspClient {
 
   async requestLeaveSwap({
     adaptorPubkey,
+    directAdaptorPubkey,
+    directFromCpfpAdaptorPubkey,
     totalAmountSats,
     targetAmountSats,
     feeSats,
@@ -320,6 +322,8 @@ export default class SspClient {
       queryPayload: RequestSwapLeaves,
       variables: {
         adaptor_pubkey: adaptorPubkey,
+        direct_adaptor_pubkey: directAdaptorPubkey,
+        direct_from_cpfp_adaptor_pubkey: directFromCpfpAdaptorPubkey,
         total_amount_sats: totalAmountSats,
         target_amount_sats: targetAmountSats,
         fee_sats: feeSats,
@@ -340,6 +344,8 @@ export default class SspClient {
 
   async completeLeaveSwap({
     adaptorSecretKey,
+    directAdaptorSecretKey,
+    directFromCpfpAdaptorSecretKey,
     userOutboundTransferExternalId,
     leavesSwapRequestId,
   }: CompleteLeavesSwapInput): Promise<LeavesSwapRequest | null> {
@@ -347,6 +353,8 @@ export default class SspClient {
       queryPayload: CompleteLeavesSwap,
       variables: {
         adaptor_secret_key: adaptorSecretKey,
+        direct_adaptor_secret_key: directAdaptorSecretKey,
+        direct_from_cpfp_adaptor_secret_key: directFromCpfpAdaptorSecretKey,
         user_outbound_transfer_external_id: userOutboundTransferExternalId,
         leaves_swap_request_id: leavesSwapRequestId,
       },

package/src/graphql/mutations/CompleteLeavesSwap.ts

@@ -3,10 +3,18 @@ import { FRAGMENT as LeavesSwapRequestFragment } from "../objects/LeavesSwapRequ
 export const CompleteLeavesSwap = `
   mutation CompleteLeavesSwap(
     $adaptor_secret_key: String!
+    $direct_adaptor_secret_key: String!
+    $direct_from_cpfp_adaptor_secret_key: String!
     $user_outbound_transfer_external_id: UUID!
     $leaves_swap_request_id: ID!
   ) {
-    complete_leaves_swap(input: { adaptor_secret_key: $adaptor_secret_key, user_outbound_transfer_external_id: $user_outbound_transfer_external_id, leaves_swap_request_id: $leaves_swap_request_id }) {
+    complete_leaves_swap(input: { 
+      adaptor_secret_key: $adaptor_secret_key, 
+      direct_adaptor_secret_key: $direct_adaptor_secret_key,
+      direct_from_cpfp_adaptor_secret_key: $direct_from_cpfp_adaptor_secret_key,
+      user_outbound_transfer_external_id: $user_outbound_transfer_external_id, 
+      leaves_swap_request_id: $leaves_swap_request_id 
+    }) {
       request {
         ...LeavesSwapRequestFragment
       }

package/src/graphql/mutations/RequestSwapLeaves.ts

@@ -3,6 +3,8 @@ import { FRAGMENT as LeavesSwapRequestFragment } from "../objects/LeavesSwapRequ
 export const RequestSwapLeaves = `
   mutation RequestSwapLeaves(
     $adaptor_pubkey: PublicKey!
+    $direct_adaptor_pubkey: PublicKey
+    $direct_from_cpfp_adaptor_pubkey: PublicKey
     $total_amount_sats: Long!
     $target_amount_sats: Long!
     $fee_sats: Long!
@@ -12,6 +14,8 @@ export const RequestSwapLeaves = `
   ) {
     request_leaves_swap(input: {
       adaptor_pubkey: $adaptor_pubkey
+      direct_adaptor_pubkey: $direct_adaptor_pubkey
+      direct_from_cpfp_adaptor_pubkey: $direct_from_cpfp_adaptor_pubkey
       total_amount_sats: $total_amount_sats
       target_amount_sats: $target_amount_sats
       fee_sats: $fee_sats

package/src/graphql/objects/CompleteLeavesSwapInput.ts

@@ -1,45 +1,45 @@
-
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
-
-
-
-
 interface CompleteLeavesSwapInput {
+  adaptorSecretKey: string;
 
+  directAdaptorSecretKey: string;
 
-    adaptorSecretKey: string;
-
-    userOutboundTransferExternalId: string;
-
-    leavesSwapRequestId: string;
-
-
+  directFromCpfpAdaptorSecretKey: string;
 
+  userOutboundTransferExternalId: string;
 
+  leavesSwapRequestId: string;
 }
 
-export const CompleteLeavesSwapInputFromJson = (obj: any): CompleteLeavesSwapInput => {
-    return {
-        adaptorSecretKey: obj["complete_leaves_swap_input_adaptor_secret_key"],
-        userOutboundTransferExternalId: obj["complete_leaves_swap_input_user_outbound_transfer_external_id"],
-        leavesSwapRequestId: obj["complete_leaves_swap_input_leaves_swap_request_id"],
-
-        } as CompleteLeavesSwapInput;
-
-}
-export const CompleteLeavesSwapInputToJson = (obj: CompleteLeavesSwapInput): any => {
-return {
-complete_leaves_swap_input_adaptor_secret_key: obj.adaptorSecretKey,
-complete_leaves_swap_input_user_outbound_transfer_external_id: obj.userOutboundTransferExternalId,
-complete_leaves_swap_input_leaves_swap_request_id: obj.leavesSwapRequestId,
-
-        }
-
-}
-
-
-
-
+export const CompleteLeavesSwapInputFromJson = (
+  obj: any,
+): CompleteLeavesSwapInput => {
+  return {
+    adaptorSecretKey: obj["complete_leaves_swap_input_adaptor_secret_key"],
+    directAdaptorSecretKey:
+      obj["complete_leaves_swap_input_direct_adaptor_secret_key"],
+    directFromCpfpAdaptorSecretKey:
+      obj["complete_leaves_swap_input_direct_from_cpfp_adaptor_secret_key"],
+    userOutboundTransferExternalId:
+      obj["complete_leaves_swap_input_user_outbound_transfer_external_id"],
+    leavesSwapRequestId:
+      obj["complete_leaves_swap_input_leaves_swap_request_id"],
+  } as CompleteLeavesSwapInput;
+};
+export const CompleteLeavesSwapInputToJson = (
+  obj: CompleteLeavesSwapInput,
+): any => {
+  return {
+    complete_leaves_swap_input_adaptor_secret_key: obj.adaptorSecretKey,
+    complete_leaves_swap_input_direct_adaptor_secret_key:
+      obj.directAdaptorSecretKey,
+    complete_leaves_swap_input_direct_from_cpfp_adaptor_secret_key:
+      obj.directFromCpfpAdaptorSecretKey,
+    complete_leaves_swap_input_user_outbound_transfer_external_id:
+      obj.userOutboundTransferExternalId,
+    complete_leaves_swap_input_leaves_swap_request_id: obj.leavesSwapRequestId,
+  };
+};
 
 export default CompleteLeavesSwapInput;

package/src/graphql/objects/LeavesSwapRequest.ts

@@ -175,6 +175,10 @@ fragment LeavesSwapRequestFragment on LeavesSwapRequest {
         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
     }
 }`;
 

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";