@buildonspark/spark-sdk 0.2.11 → 0.2.13

package/src/proto/spark_authn.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.5
+//   protoc-gen-ts_proto  v2.7.7
 //   protoc               v5.29.3
 // source: spark_authn.proto
 

package/src/proto/spark_token.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.5
+//   protoc-gen-ts_proto  v2.7.7
 //   protoc               v5.29.3
 // source: spark_token.proto
 

package/src/proto/validate/validate.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.5
+//   protoc-gen-ts_proto  v2.7.7
 //   protoc               v5.29.3
 // source: validate/validate.proto
 
@@ -1788,16 +1788,12 @@ export const FloatRules: MessageFns<FloatRules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(45).float(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.float(v);
+      writer.uint32(53).float(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.float(v);
+      writer.uint32(61).float(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -1984,16 +1980,12 @@ export const DoubleRules: MessageFns<DoubleRules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(41).double(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.double(v);
+      writer.uint32(49).double(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.double(v);
+      writer.uint32(57).double(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -2180,16 +2172,12 @@ export const Int32Rules: MessageFns<Int32Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).int32(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.int32(v);
+      writer.uint32(48).int32(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.int32(v);
+      writer.uint32(56).int32(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -2376,16 +2364,12 @@ export const Int64Rules: MessageFns<Int64Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).int64(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.int64(v);
+      writer.uint32(48).int64(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.int64(v);
+      writer.uint32(56).int64(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -2572,16 +2556,12 @@ export const UInt32Rules: MessageFns<UInt32Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).uint32(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.uint32(v);
+      writer.uint32(48).uint32(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.uint32(v);
+      writer.uint32(56).uint32(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -2768,16 +2748,12 @@ export const UInt64Rules: MessageFns<UInt64Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).uint64(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.uint64(v);
+      writer.uint32(48).uint64(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.uint64(v);
+      writer.uint32(56).uint64(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -2964,16 +2940,12 @@ export const SInt32Rules: MessageFns<SInt32Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).sint32(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.sint32(v);
+      writer.uint32(48).sint32(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.sint32(v);
+      writer.uint32(56).sint32(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -3160,16 +3132,12 @@ export const SInt64Rules: MessageFns<SInt64Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(40).sint64(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.sint64(v);
+      writer.uint32(48).sint64(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.sint64(v);
+      writer.uint32(56).sint64(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -3356,16 +3324,12 @@ export const Fixed32Rules: MessageFns<Fixed32Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(45).fixed32(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.fixed32(v);
+      writer.uint32(53).fixed32(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.fixed32(v);
+      writer.uint32(61).fixed32(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -3552,16 +3516,12 @@ export const Fixed64Rules: MessageFns<Fixed64Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(41).fixed64(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.fixed64(v);
+      writer.uint32(49).fixed64(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.fixed64(v);
+      writer.uint32(57).fixed64(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -3748,16 +3708,12 @@ export const SFixed32Rules: MessageFns<SFixed32Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(45).sfixed32(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.sfixed32(v);
+      writer.uint32(53).sfixed32(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.sfixed32(v);
+      writer.uint32(61).sfixed32(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -3944,16 +3900,12 @@ export const SFixed64Rules: MessageFns<SFixed64Rules> = {
     if (message.gte !== undefined && message.gte !== 0) {
       writer.uint32(41).sfixed64(message.gte);
     }
-    writer.uint32(50).fork();
     for (const v of message.in) {
-      writer.sfixed64(v);
+      writer.uint32(49).sfixed64(v!);
     }
-    writer.join();
-    writer.uint32(58).fork();
     for (const v of message.notIn) {
-      writer.sfixed64(v);
+      writer.uint32(57).sfixed64(v!);
     }
-    writer.join();
     if (message.ignoreEmpty !== undefined && message.ignoreEmpty !== false) {
       writer.uint32(64).bool(message.ignoreEmpty);
     }
@@ -5025,16 +4977,12 @@ export const EnumRules: MessageFns<EnumRules> = {
     if (message.definedOnly !== undefined && message.definedOnly !== false) {
       writer.uint32(16).bool(message.definedOnly);
     }
-    writer.uint32(26).fork();
     for (const v of message.in) {
-      writer.int32(v);
+      writer.uint32(24).int32(v!);
     }
-    writer.join();
-    writer.uint32(34).fork();
     for (const v of message.notIn) {
-      writer.int32(v);
+      writer.uint32(32).int32(v!);
     }
-    writer.join();
     return writer;
   },
 

package/src/services/deposit.ts

@@ -28,6 +28,11 @@ import { ConnectionManager } from "./connection.js";
 type ValidateDepositAddressParams = {
   address: Address;
   userPubkey: Uint8Array;
+  verifyCoordinatorProof?: boolean;
+};
+
+export type GenerateStaticDepositAddressParams = {
+  signingPubkey: Uint8Array;
 };
 
 export type GenerateDepositAddressParams = {
@@ -43,8 +48,6 @@ export type CreateTreeRootParams = {
   vout: number;
 };
 
-const INITIAL_TIME_LOCK = 2000;
-
 export class DepositService {
   private readonly config: WalletConfigService;
   private readonly connectionManager: ConnectionManager;
@@ -60,6 +63,7 @@ export class DepositService {
   private async validateDepositAddress({
     address,
     userPubkey,
+    verifyCoordinatorProof = false,
   }: ValidateDepositAddressParams) {
     if (
       !address.depositAddressProof ||
@@ -106,7 +110,10 @@ export class DepositService {
 
     const addrHash = sha256(address.address);
     for (const operator of Object.values(this.config.getSigningOperators())) {
-      if (operator.identifier === this.config.getCoordinatorIdentifier()) {
+      if (
+        operator.identifier === this.config.getCoordinatorIdentifier() &&
+        !verifyCoordinatorProof
+      ) {
         continue;
       }
 
@@ -135,6 +142,51 @@ export class DepositService {
     }
   }
 
+  async generateStaticDepositAddress({
+    signingPubkey,
+  }: GenerateStaticDepositAddressParams): Promise<GenerateDepositAddressResponse> {
+    const sparkClient = await this.connectionManager.createSparkClient(
+      this.config.getCoordinatorAddress(),
+    );
+
+    let depositResp: GenerateDepositAddressResponse;
+    try {
+      depositResp = await sparkClient.generate_static_deposit_address({
+        signingPublicKey: signingPubkey,
+        identityPublicKey: await this.config.signer.getIdentityPublicKey(),
+        network: this.config.getNetworkProto(),
+      });
+    } catch (error) {
+      throw new NetworkError(
+        "Failed to generate static deposit address",
+        {
+          operation: "generate_static_deposit_address",
+          errorCount: 1,
+          errors: error instanceof Error ? error.message : String(error),
+        },
+        error as Error,
+      );
+    }
+
+    if (!depositResp.depositAddress) {
+      throw new ValidationError(
+        "No static deposit address response from coordinator",
+        {
+          field: "depositAddress",
+          value: depositResp,
+        },
+      );
+    }
+
+    await this.validateDepositAddress({
+      address: depositResp.depositAddress,
+      userPubkey: signingPubkey,
+      verifyCoordinatorProof: true,
+    });
+
+    return depositResp;
+  }
+
   async generateDepositAddress({
     signingPubkey,
     leafId,

package/src/services/lightning.ts

@@ -1,9 +1,9 @@
+import { secp256k1 } from "@noble/curves/secp256k1";
 import {
   bytesToNumberBE,
   hexToBytes,
   numberToBytesBE,
-} from "@noble/curves/abstract/utils";
-import { secp256k1 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 } from "@noble/hashes/sha2";
 import { uuidv7 } from "uuidv7";
 import { NetworkError, ValidationError } from "../errors/types.js";

package/src/services/signing.ts

@@ -1,4 +1,4 @@
-import { hexToBytes } from "@noble/curves/abstract/utils";
+import { hexToBytes } from "@noble/curves/utils";
 import { Transaction } from "@scure/btc-signer";
 import { TransactionInput } from "@scure/btc-signer/psbt";
 import { ValidationError } from "../errors/types.js";

package/src/services/token-transactions.ts

@@ -1,9 +1,9 @@
+import { secp256k1 } from "@noble/curves/secp256k1";
 import {
   bytesToHex,
   bytesToNumberBE,
   numberToBytesBE,
-} from "@noble/curves/abstract/utils";
-import { secp256k1 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { hexToBytes } from "@noble/hashes/utils";
 import {
   InternalValidationError,
@@ -17,9 +17,7 @@ import {
   QueryTokenTransactionsRequest as QueryTokenTransactionsRequestV0,
   RevocationSecretWithIndex,
   SignTokenTransactionResponse,
-  SparkInvoiceFields,
   TokenTransaction as TokenTransactionV0,
-  TokenTransactionWithStatus as TokenTransactionWithStatusV0,
 } from "../proto/spark.js";
 import {
   InputTtxoSignaturesPerOperator,
@@ -28,7 +26,6 @@ import {
   SignatureWithIndex,
   TokenOutput,
   TokenTransaction,
-  TokenTransactionWithStatus as TokenTransactionWithStatusV1,
 } from "../proto/spark_token.js";
 import { TokenOutputsMap } from "../spark-wallet/types.js";
 import { SparkCallOptions } from "../types/grpc.js";

package/src/services/transfer.ts

@@ -1,10 +1,10 @@
+import { secp256k1 } from "@noble/curves/secp256k1";
 import {
   bytesToHex,
   equalBytes,
   hexToBytes,
   numberToBytesBE,
-} from "@noble/curves/abstract/utils";
-import { secp256k1 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 } from "@noble/hashes/sha2";
 import { Transaction } from "@scure/btc-signer";
 import { TransactionInput, TransactionOutput } from "@scure/btc-signer/psbt";
@@ -1452,32 +1452,6 @@ export class TransferService extends BaseTransferService {
     }
   }
 
-  async cancelTransfer(
-    transfer: Transfer,
-    operatorAddress: string,
-  ): Promise<Transfer | undefined> {
-    const sparkClient =
-      await this.connectionManager.createSparkClient(operatorAddress);
-
-    try {
-      const response = await sparkClient.cancel_transfer({
-        transferId: transfer.id,
-        senderIdentityPublicKey:
-          await this.config.signer.getIdentityPublicKey(),
-      });
-
-      return response.transfer;
-    } catch (error) {
-      throw new NetworkError(
-        "Failed to cancel transfer",
-        {
-          method: "POST",
-        },
-        error as Error,
-      );
-    }
-  }
-
   async queryPendingTransfersBySender(
     operatorAddress: string,
   ): Promise<QueryTransfersResponse> {

package/src/signer/signer.ts

@@ -1,11 +1,11 @@
 import { privateNegate } from "@bitcoinerlab/secp256k1";
+import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
 import {
   bytesToHex,
   bytesToNumberBE,
   equalBytes,
   hexToBytes,
-} from "@noble/curves/abstract/utils";
-import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 } from "@noble/hashes/sha2";
 import { HDKey } from "@scure/bip32";
 import { generateMnemonic, mnemonicToSeed } from "@scure/bip39";