@buildonspark/spark-sdk 0.3.2 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @buildonspark/spark-sdk
 
+## 0.3.3
+
+### Patch Changes
+
+- - Revert "Fix timelock value in SDK" temporarily
+
 ## 0.3.2
 
 ### Patch Changes

package/dist/bare/index.cjs

@@ -18495,7 +18495,7 @@ var isWebExtension = (
   "chrome" in globalThis && globalThis.chrome.runtime?.id
 );
 var userAgent = "navigator" in globalThis ? globalThis.navigator.userAgent || "unknown-user-agent" : void 0;
-var packageVersion = true ? "0.3.2" : "unknown";
+var packageVersion = true ? "0.3.3" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -24089,10 +24089,10 @@ var INITIAL_TIMELOCK = 2e3;
 var TEST_UNILATERAL_TIMELOCK = 100;
 var TIME_LOCK_INTERVAL = 100;
 var DIRECT_TIMELOCK_OFFSET = 50;
-var INITIAL_SEQUENCE = INITIAL_TIMELOCK;
-var INITIAL_DIRECT_SEQUENCE = INITIAL_TIMELOCK + DIRECT_TIMELOCK_OFFSET;
-var TEST_UNILATERAL_SEQUENCE = TEST_UNILATERAL_TIMELOCK;
-var TEST_UNILATERAL_DIRECT_SEQUENCE = TEST_UNILATERAL_TIMELOCK + DIRECT_TIMELOCK_OFFSET;
+var INITIAL_SEQUENCE = 1 << 30 | INITIAL_TIMELOCK;
+var INITIAL_DIRECT_SEQUENCE = 1 << 30 | INITIAL_TIMELOCK + DIRECT_TIMELOCK_OFFSET;
+var TEST_UNILATERAL_SEQUENCE = 1 << 30 | TEST_UNILATERAL_TIMELOCK;
+var TEST_UNILATERAL_DIRECT_SEQUENCE = 1 << 30 | TEST_UNILATERAL_TIMELOCK + DIRECT_TIMELOCK_OFFSET;
 var ESTIMATED_TX_SIZE = 191;
 var DEFAULT_SATS_PER_VBYTE = 5;
 var DEFAULT_FEE_SATS = ESTIMATED_TX_SIZE * DEFAULT_SATS_PER_VBYTE;
@@ -24363,8 +24363,8 @@ function getCurrentTimelock(currSequence) {
 function getTransactionSequence(currSequence) {
   const timelock = getCurrentTimelock(currSequence);
   return {
-    nextSequence: timelock,
-    nextDirectSequence: timelock + DIRECT_TIMELOCK_OFFSET
+    nextSequence: 1 << 30 | timelock,
+    nextDirectSequence: 1 << 30 | timelock + DIRECT_TIMELOCK_OFFSET
   };
 }
 function checkIfValidSequence(currSequence) {
@@ -24407,8 +24407,8 @@ function getNextTransactionSequence(currSequence, isNodeTx) {
     });
   }
   return {
-    nextSequence: nextTimelock,
-    nextDirectSequence: nextTimelock + DIRECT_TIMELOCK_OFFSET
+    nextSequence: 1 << 30 | nextTimelock,
+    nextDirectSequence: 1 << 30 | nextTimelock + DIRECT_TIMELOCK_OFFSET
   };
 }
 function getEphemeralAnchorOutput() {
@@ -24469,51 +24469,6 @@ var BaseTransferService = class {
     this.connectionManager = connectionManager;
     this.signingService = signingService;
   }
-  async sendTransferTweakKey(transfer, leaves, cpfpRefundSignatureMap, directRefundSignatureMap, directFromCpfpRefundSignatureMap) {
-    const keyTweakInputMap = await this.prepareSendTransferKeyTweaks(
-      transfer.id,
-      transfer.receiverIdentityPublicKey,
-      leaves,
-      cpfpRefundSignatureMap,
-      directRefundSignatureMap,
-      directFromCpfpRefundSignatureMap
-    );
-    let updatedTransfer;
-    const coordinatorOperator = this.config.getSigningOperators()[this.config.getCoordinatorIdentifier()];
-    if (!coordinatorOperator) {
-      throw new ValidationError("Coordinator operator not found", {
-        field: "coordinator"
-      });
-    }
-    for (const [identifier, operator] of Object.entries(
-      this.config.getSigningOperators()
-    ).filter(([_, op]) => op.address !== this.config.getCoordinatorAddress())) {
-      updatedTransfer = await this.finalizeTransfer(
-        operator,
-        identifier,
-        keyTweakInputMap,
-        transfer,
-        updatedTransfer
-      );
-    }
-    updatedTransfer = await this.finalizeTransfer(
-      coordinatorOperator,
-      this.config.getCoordinatorIdentifier(),
-      keyTweakInputMap,
-      transfer,
-      updatedTransfer
-    );
-    if (!updatedTransfer) {
-      throw new ValidationError(
-        "No transfer response received from any operator",
-        {
-          field: "operators",
-          value: Object.keys(this.config.getSigningOperators()).length
-        }
-      );
-    }
-    return updatedTransfer;
-  }
   async deliverTransferPackage(transfer, leaves, cpfpRefundSignatureMap, directRefundSignatureMap, directFromCpfpRefundSignatureMap) {
     const keyTweakInputMap = await this.prepareSendTransferKeyTweaks(
       transfer.id,
@@ -24655,55 +24610,7 @@ var BaseTransferService = class {
     transferPackage.userSignature = new Uint8Array(signature);
     return transferPackage;
   }
-  async finalizeTransfer(operator, identifier, keyTweakInputMap, transfer, updatedTransfer) {
-    const sparkClient = await this.connectionManager.createSparkClient(
-      operator.address
-    );
-    const leavesToSend = keyTweakInputMap.get(identifier);
-    if (!leavesToSend) {
-      throw new ValidationError("No leaves to send for operator", {
-        field: "operator",
-        value: identifier
-      });
-    }
-    let transferResp;
-    try {
-      transferResp = await sparkClient.finalize_transfer({
-        transferId: transfer.id,
-        ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey(),
-        leavesToSend
-      });
-    } catch (error) {
-      throw new NetworkError(
-        "Failed to finalize transfer",
-        {
-          method: "POST"
-        },
-        error
-      );
-    }
-    if (!updatedTransfer) {
-      updatedTransfer = transferResp.transfer;
-    } else {
-      if (!transferResp.transfer) {
-        throw new ValidationError("No transfer response from operator", {
-          field: "transfer",
-          value: transfer.id
-        });
-      }
-      if (!this.compareTransfers(updatedTransfer, transferResp.transfer)) {
-        throw new ValidationError(
-          "Inconsistent transfer response from operators",
-          {
-            field: "transfer",
-            value: transfer.id
-          }
-        );
-      }
-    }
-    return updatedTransfer;
-  }
-  async signRefunds(leafDataMap, operatorSigningResults, cpfpAdaptorPubKey, directAdaptorPubKey, directFromCpfpAdaptorPubKey) {
+  async signRefunds(leafDataMap, operatorSigningResults) {
     const nodeSignatures = [];
     for (const operatorSigningResult of operatorSigningResults) {
       const leafData = leafDataMap.get(operatorSigningResult.leafId);
@@ -24732,7 +24639,6 @@ var BaseTransferService = class {
         keyDerivation: leafData.keyDerivation,
         selfCommitment: leafData.signingNonceCommitment,
         statechainCommitments: operatorSigningResult.refundTxSigningResult?.signingNonceCommitments,
-        adaptorPubKey: cpfpAdaptorPubKey,
         verifyingKey: operatorSigningResult.verifyingKey
       });
       const cpfpRefundAggregate = await this.config.signer.aggregateFrost({
@@ -24743,8 +24649,7 @@ var BaseTransferService = class {
         statechainCommitments: operatorSigningResult.refundTxSigningResult?.signingNonceCommitments,
         selfCommitment: leafData.signingNonceCommitment,
         publicKey,
-        selfSignature: cpfpUserSignature,
-        adaptorPubKey: cpfpAdaptorPubKey
+        selfSignature: cpfpUserSignature
       });
       let directRefundAggregate;
       let directFromCpfpRefundAggregate;
@@ -24762,7 +24667,6 @@ var BaseTransferService = class {
             keyDerivation: leafData.keyDerivation,
             selfCommitment: leafData.directSigningNonceCommitment,
             statechainCommitments: operatorSigningResult.directRefundTxSigningResult?.signingNonceCommitments,
-            adaptorPubKey: directAdaptorPubKey,
             verifyingKey: operatorSigningResult.verifyingKey
           });
           directRefundAggregate = await this.config.signer.aggregateFrost({
@@ -24773,8 +24677,7 @@ var BaseTransferService = class {
             statechainCommitments: operatorSigningResult.directRefundTxSigningResult?.signingNonceCommitments,
             selfCommitment: leafData.directSigningNonceCommitment,
             publicKey,
-            selfSignature: directUserSignature,
-            adaptorPubKey: directAdaptorPubKey
+            selfSignature: directUserSignature
           });
         }
         if (leafData.directFromCpfpRefundTx) {
@@ -24789,7 +24692,6 @@ var BaseTransferService = class {
             keyDerivation: leafData.keyDerivation,
             selfCommitment: leafData.directFromCpfpRefundSigningNonceCommitment,
             statechainCommitments: operatorSigningResult.directFromCpfpRefundTxSigningResult?.signingNonceCommitments,
-            adaptorPubKey: directFromCpfpAdaptorPubKey,
             verifyingKey: operatorSigningResult.verifyingKey
           });
           directFromCpfpRefundAggregate = await this.config.signer.aggregateFrost({
@@ -24800,8 +24702,7 @@ var BaseTransferService = class {
             statechainCommitments: operatorSigningResult.directFromCpfpRefundTxSigningResult?.signingNonceCommitments,
             selfCommitment: leafData.directFromCpfpRefundSigningNonceCommitment,
             publicKey,
-            selfSignature: directFromCpfpUserSignature,
-            adaptorPubKey: directFromCpfpAdaptorPubKey
+            selfSignature: directFromCpfpUserSignature
           });
         }
       }
@@ -24917,30 +24818,6 @@ var TransferService = class extends BaseTransferService {
   constructor(config, connectionManager, signingService) {
     super(config, connectionManager, signingService);
   }
-  /**
-   * @deprecated Use sendTransferWithKeyTweaks instead
-   * Deprecated in v0.1.32
-   */
-  async sendTransfer(leaves, receiverIdentityPubkey) {
-    const {
-      transfer,
-      signatureMap,
-      directSignatureMap,
-      directFromCpfpSignatureMap
-    } = await this.sendTransferSignRefund(
-      leaves,
-      receiverIdentityPubkey,
-      new Date(Date.now() + DEFAULT_EXPIRY_TIME)
-    );
-    const transferWithTweakedKeys = await this.sendTransferTweakKey(
-      transfer,
-      leaves,
-      signatureMap,
-      directSignatureMap,
-      directFromCpfpSignatureMap
-    );
-    return transferWithTweakedKeys;
-  }
   async claimTransfer(transfer, leaves) {
     let proofMap;
     if (transfer.status === 2 /* TRANSFER_STATUS_SENDER_KEY_TWEAKED */) {
@@ -25084,18 +24961,7 @@ var TransferService = class extends BaseTransferService {
       leafDataMap
     };
   }
-  async counterSwapSignRefund(leaves, receiverIdentityPubkey, expiryTime, cpfpAdaptorPubKey, directAdaptorPubKey, directFromCpfpAdaptorPubKey) {
-    return this.sendTransferSignRefundInternal(
-      leaves,
-      receiverIdentityPubkey,
-      expiryTime,
-      true,
-      cpfpAdaptorPubKey,
-      directAdaptorPubKey,
-      directFromCpfpAdaptorPubKey
-    );
-  }
-  async sendTransferSignRefundInternal(leaves, receiverIdentityPubkey, expiryTime, forSwap, cpfpAdaptorPubKey, directAdaptorPubKey, directFromCpfpAdaptorPubKey) {
+  async sendTransferSignRefundInternal(leaves, receiverIdentityPubkey, expiryTime, forSwap) {
     const transferId = (0, import_uuidv7.uuidv7)();
     const leafDataMap = /* @__PURE__ */ new Map();
     for (const leaf of leaves) {
@@ -25130,21 +24996,7 @@ var TransferService = class extends BaseTransferService {
     );
     let response;
     try {
-      if (cpfpAdaptorPubKey !== void 0 || directAdaptorPubKey !== void 0 || directFromCpfpAdaptorPubKey !== void 0) {
-        response = await sparkClient.counter_leaf_swap_v2({
-          transfer: {
-            transferId,
-            leavesToSend: signingJobs,
-            ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey(),
-            receiverIdentityPublicKey: receiverIdentityPubkey,
-            expiryTime
-          },
-          swapId: (0, import_uuidv7.uuidv7)(),
-          adaptorPublicKey: cpfpAdaptorPubKey,
-          directAdaptorPublicKey: directAdaptorPubKey,
-          directFromCpfpAdaptorPublicKey: directFromCpfpAdaptorPubKey
-        });
-      } else if (forSwap) {
+      if (forSwap) {
         response = await sparkClient.start_leaf_swap_v2({
           transferId,
           leavesToSend: signingJobs,
@@ -25169,10 +25021,7 @@ var TransferService = class extends BaseTransferService {
     }
     const signatures = await this.signRefunds(
       leafDataMap,
-      response.signingResults,
-      cpfpAdaptorPubKey,
-      directAdaptorPubKey,
-      directFromCpfpAdaptorPubKey
+      response.signingResults
     );
     const cpfpSignatureMap = /* @__PURE__ */ new Map();
     const directSignatureMap = /* @__PURE__ */ new Map();

package/dist/bare/index.d.cts

@@ -3031,12 +3031,10 @@ declare class BaseTransferService {
     protected readonly connectionManager: ConnectionManager;
     protected readonly signingService: SigningService;
     constructor(config: WalletConfigService, connectionManager: ConnectionManager, signingService: SigningService);
-    sendTransferTweakKey(transfer: Transfer, leaves: LeafKeyTweak[], cpfpRefundSignatureMap: Map<string, Uint8Array>, directRefundSignatureMap: Map<string, Uint8Array>, directFromCpfpRefundSignatureMap: Map<string, Uint8Array>): Promise<Transfer>;
     deliverTransferPackage(transfer: Transfer, leaves: LeafKeyTweak[], cpfpRefundSignatureMap: Map<string, Uint8Array>, directRefundSignatureMap: Map<string, Uint8Array>, directFromCpfpRefundSignatureMap: Map<string, Uint8Array>): Promise<Transfer>;
     sendTransferWithKeyTweaks(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, sparkInvoice?: SparkAddressFormat): Promise<Transfer>;
     private prepareTransferPackage;
-    private finalizeTransfer;
-    signRefunds(leafDataMap: Map<string, LeafRefundSigningData>, operatorSigningResults: LeafRefundTxSigningResult[], cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<NodeSignatures[]>;
+    signRefunds(leafDataMap: Map<string, LeafRefundSigningData>, operatorSigningResults: LeafRefundTxSigningResult[]): Promise<NodeSignatures[]>;
     private prepareSendTransferKeyTweaks;
     private prepareSingleSendTransferKeyTweak;
     protected findShare(shares: VerifiableSecretShare[], operatorID: number): VerifiableSecretShare | undefined;
@@ -3044,11 +3042,6 @@ declare class BaseTransferService {
 }
 declare class TransferService extends BaseTransferService {
     constructor(config: WalletConfigService, connectionManager: ConnectionManager, signingService: SigningService);
-    /**
-     * @deprecated Use sendTransferWithKeyTweaks instead
-     * Deprecated in v0.1.32
-     */
-    sendTransfer(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array): Promise<Transfer>;
     claimTransfer(transfer: Transfer, leaves: LeafKeyTweak[]): Promise<FinalizeNodeSignaturesResponse>;
     queryPendingTransfers(transferIds?: string[]): Promise<QueryTransfersResponse>;
     queryAllTransfers(limit: number, offset: number): Promise<QueryTransfersResponse>;
@@ -3068,15 +3061,7 @@ declare class TransferService extends BaseTransferService {
         directFromCpfpSignatureMap: Map<string, Uint8Array>;
         leafDataMap: Map<string, LeafRefundSigningData>;
     }>;
-    counterSwapSignRefund(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<{
-        transfer: Transfer;
-        signatureMap: Map<string, Uint8Array>;
-        directSignatureMap: Map<string, Uint8Array>;
-        directFromCpfpSignatureMap: Map<string, Uint8Array>;
-        leafDataMap: Map<string, LeafRefundSigningData>;
-        signingResults: LeafRefundTxSigningResult[];
-    }>;
-    sendTransferSignRefundInternal(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, forSwap: boolean, cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<{
+    sendTransferSignRefundInternal(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, forSwap: boolean): Promise<{
         transfer: Transfer;
         signatureMap: Map<string, Uint8Array>;
         directSignatureMap: Map<string, Uint8Array>;
@@ -3906,9 +3891,9 @@ declare function filterTokenBalanceForTokenIdentifier(tokenBalances: TokenBalanc
 declare function getTransferPackageSigningPayload(transferID: string, transferPackage: TransferPackage): Uint8Array;
 
 declare const DIRECT_TIMELOCK_OFFSET = 50;
-declare const INITIAL_SEQUENCE = 2000;
+declare const INITIAL_SEQUENCE: number;
 declare const INITIAL_DIRECT_SEQUENCE: number;
-declare const TEST_UNILATERAL_SEQUENCE = 100;
+declare const TEST_UNILATERAL_SEQUENCE: number;
 declare const TEST_UNILATERAL_DIRECT_SEQUENCE: number;
 declare const DEFAULT_FEE_SATS: number;
 /**

package/dist/bare/index.d.ts

@@ -3031,12 +3031,10 @@ declare class BaseTransferService {
     protected readonly connectionManager: ConnectionManager;
     protected readonly signingService: SigningService;
     constructor(config: WalletConfigService, connectionManager: ConnectionManager, signingService: SigningService);
-    sendTransferTweakKey(transfer: Transfer, leaves: LeafKeyTweak[], cpfpRefundSignatureMap: Map<string, Uint8Array>, directRefundSignatureMap: Map<string, Uint8Array>, directFromCpfpRefundSignatureMap: Map<string, Uint8Array>): Promise<Transfer>;
     deliverTransferPackage(transfer: Transfer, leaves: LeafKeyTweak[], cpfpRefundSignatureMap: Map<string, Uint8Array>, directRefundSignatureMap: Map<string, Uint8Array>, directFromCpfpRefundSignatureMap: Map<string, Uint8Array>): Promise<Transfer>;
     sendTransferWithKeyTweaks(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, sparkInvoice?: SparkAddressFormat): Promise<Transfer>;
     private prepareTransferPackage;
-    private finalizeTransfer;
-    signRefunds(leafDataMap: Map<string, LeafRefundSigningData>, operatorSigningResults: LeafRefundTxSigningResult[], cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<NodeSignatures[]>;
+    signRefunds(leafDataMap: Map<string, LeafRefundSigningData>, operatorSigningResults: LeafRefundTxSigningResult[]): Promise<NodeSignatures[]>;
     private prepareSendTransferKeyTweaks;
     private prepareSingleSendTransferKeyTweak;
     protected findShare(shares: VerifiableSecretShare[], operatorID: number): VerifiableSecretShare | undefined;
@@ -3044,11 +3042,6 @@ declare class BaseTransferService {
 }
 declare class TransferService extends BaseTransferService {
     constructor(config: WalletConfigService, connectionManager: ConnectionManager, signingService: SigningService);
-    /**
-     * @deprecated Use sendTransferWithKeyTweaks instead
-     * Deprecated in v0.1.32
-     */
-    sendTransfer(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array): Promise<Transfer>;
     claimTransfer(transfer: Transfer, leaves: LeafKeyTweak[]): Promise<FinalizeNodeSignaturesResponse>;
     queryPendingTransfers(transferIds?: string[]): Promise<QueryTransfersResponse>;
     queryAllTransfers(limit: number, offset: number): Promise<QueryTransfersResponse>;
@@ -3068,15 +3061,7 @@ declare class TransferService extends BaseTransferService {
         directFromCpfpSignatureMap: Map<string, Uint8Array>;
         leafDataMap: Map<string, LeafRefundSigningData>;
     }>;
-    counterSwapSignRefund(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<{
-        transfer: Transfer;
-        signatureMap: Map<string, Uint8Array>;
-        directSignatureMap: Map<string, Uint8Array>;
-        directFromCpfpSignatureMap: Map<string, Uint8Array>;
-        leafDataMap: Map<string, LeafRefundSigningData>;
-        signingResults: LeafRefundTxSigningResult[];
-    }>;
-    sendTransferSignRefundInternal(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, forSwap: boolean, cpfpAdaptorPubKey?: Uint8Array, directAdaptorPubKey?: Uint8Array, directFromCpfpAdaptorPubKey?: Uint8Array): Promise<{
+    sendTransferSignRefundInternal(leaves: LeafKeyTweak[], receiverIdentityPubkey: Uint8Array, expiryTime: Date, forSwap: boolean): Promise<{
         transfer: Transfer;
         signatureMap: Map<string, Uint8Array>;
         directSignatureMap: Map<string, Uint8Array>;
@@ -3906,9 +3891,9 @@ declare function filterTokenBalanceForTokenIdentifier(tokenBalances: TokenBalanc
 declare function getTransferPackageSigningPayload(transferID: string, transferPackage: TransferPackage): Uint8Array;
 
 declare const DIRECT_TIMELOCK_OFFSET = 50;
-declare const INITIAL_SEQUENCE = 2000;
+declare const INITIAL_SEQUENCE: number;
 declare const INITIAL_DIRECT_SEQUENCE: number;
-declare const TEST_UNILATERAL_SEQUENCE = 100;
+declare const TEST_UNILATERAL_SEQUENCE: number;
 declare const TEST_UNILATERAL_DIRECT_SEQUENCE: number;
 declare const DEFAULT_FEE_SATS: number;
 /**