@buildonspark/spark-sdk 0.1.44 → 0.1.46

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.2
+//   protoc-gen-ts_proto  v2.7.5
 //   protoc               v5.29.3
 // source: validate/validate.proto
 
@@ -1337,7 +1337,7 @@ export const FieldRules: MessageFns<FieldRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): FieldRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseFieldRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -1806,7 +1806,7 @@ export const FloatRules: MessageFns<FloatRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): FloatRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseFloatRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2002,7 +2002,7 @@ export const DoubleRules: MessageFns<DoubleRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): DoubleRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDoubleRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2198,7 +2198,7 @@ export const Int32Rules: MessageFns<Int32Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): Int32Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseInt32Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2394,7 +2394,7 @@ export const Int64Rules: MessageFns<Int64Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): Int64Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseInt64Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2590,7 +2590,7 @@ export const UInt32Rules: MessageFns<UInt32Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): UInt32Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseUInt32Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2786,7 +2786,7 @@ export const UInt64Rules: MessageFns<UInt64Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): UInt64Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseUInt64Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -2982,7 +2982,7 @@ export const SInt32Rules: MessageFns<SInt32Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): SInt32Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseSInt32Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -3178,7 +3178,7 @@ export const SInt64Rules: MessageFns<SInt64Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): SInt64Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseSInt64Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -3374,7 +3374,7 @@ export const Fixed32Rules: MessageFns<Fixed32Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): Fixed32Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseFixed32Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -3570,7 +3570,7 @@ export const Fixed64Rules: MessageFns<Fixed64Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): Fixed64Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseFixed64Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -3766,7 +3766,7 @@ export const SFixed32Rules: MessageFns<SFixed32Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): SFixed32Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseSFixed32Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -3962,7 +3962,7 @@ export const SFixed64Rules: MessageFns<SFixed64Rules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): SFixed64Rules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseSFixed64Rules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -4133,7 +4133,7 @@ export const BoolRules: MessageFns<BoolRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): BoolRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseBoolRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -4286,7 +4286,7 @@ export const StringRules: MessageFns<StringRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): StringRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseStringRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -4779,7 +4779,7 @@ export const BytesRules: MessageFns<BytesRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): BytesRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseBytesRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5040,7 +5040,7 @@ export const EnumRules: MessageFns<EnumRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): EnumRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseEnumRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5162,7 +5162,7 @@ export const MessageRules: MessageFns<MessageRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): MessageRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseMessageRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5247,7 +5247,7 @@ export const RepeatedRules: MessageFns<RepeatedRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): RepeatedRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseRepeatedRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5376,7 +5376,7 @@ export const MapRules: MessageFns<MapRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): MapRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseMapRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5511,7 +5511,7 @@ export const AnyRules: MessageFns<AnyRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): AnyRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseAnyRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5627,7 +5627,7 @@ export const DurationRules: MessageFns<DurationRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): DurationRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDurationRules();
     while (reader.pos < end) {
       const tag = reader.uint32();
@@ -5814,7 +5814,7 @@ export const TimestampRules: MessageFns<TimestampRules> = {
 
   decode(input: BinaryReader | Uint8Array, length?: number): TimestampRules {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
+    const end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseTimestampRules();
     while (reader.pos < end) {
       const tag = reader.uint32();

package/src/services/bolt11-spark.ts

@@ -1,9 +1,29 @@
-import { bech32 } from "@scure/base";
-import { sha256 } from "@noble/hashes/sha2";
-import { secp256k1 } from "@noble/curves/secp256k1";
+import { decode } from "light-bolt11-decoder";
+
 import { Network } from "../utils/network.js";
 import { ValidationError } from "../errors/index.js";
 
+// Invoice section interface
+interface Section {
+  name: string;
+  letters: string;
+  value?: any;
+  tag?: string;
+}
+
+interface RouteHint {
+  pubkey: string;
+  short_channel_id: string;
+  fee_base_msat: number;
+  fee_proportional_millionths: number;
+  cltv_expiry_delta: number;
+}
+
+const RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID = "f42400f424000001";
+const PAYMENT_HASH_NAME = "payment_hash";
+const AMOUNT_MSATS_NAME = "amount";
+const PAYMENT_SECRET_NAME = "payment_secret";
+
 interface DecodedInvoice {
   amountMSats: bigint | null;
   fallbackAddress: string | undefined;
@@ -11,103 +31,57 @@ interface DecodedInvoice {
 }
 
 export function decodeInvoice(invoice: string): DecodedInvoice {
-  const { words, prefix } = bech32.decode(
-    invoice as `${string}1${string}`,
-    1_000,
-  );
-  verifySignature(words, prefix);
-
-  const amountMSats = extractMillisatoshiAmountFromInvoice(invoice);
-
-  let fallbackAddress: string | undefined = undefined;
-  let paymentHash: string | undefined = undefined;
-  let paymentSecret: string | undefined = undefined;
-
-  // TLV data lives between the timestamp and the signature+recovery words
-  let i = 7;
-  const tlvEnd = words.length - 105;
-  while (i + 2 < tlvEnd) {
-    const tag = words[i];
-    const len1 = words[i + 1];
-    const len2 = words[i + 2];
-    if (len1 === undefined || len2 === undefined) {
-      console.log("No length word");
-      break;
+  const decodedInvoice = decode(invoice);
+  const network = getNetworkFromInvoice(invoice);
+
+  if (network === null) {
+    throw new ValidationError("Invalid network found in invoice: " + invoice);
+  }
+
+  let paymentSection: Section | undefined;
+  let routeHints: RouteHint[][] = [];
+  let amountSection: Section | undefined;
+  let paymentSecretSection: Section | undefined;
+  let fallbackAddress: string | undefined;
+
+  for (const section of decodedInvoice.sections) {
+    if (section.name === PAYMENT_HASH_NAME) {
+      paymentSection = section;
     }
-    const len = (len1 << 5) + len2;
-    const start = i + 3;
-    const end = start + len;
-
-    if (tag === 1) {
-      // payment hash (tag 'p (1)')
-      const hashWords = words.slice(start, end);
-      const hashBytes = bech32WordsToBytes(hashWords);
-      if (hashBytes.length === 32) {
-        paymentHash = Buffer.from(hashBytes).toString("hex");
-      }
-    } else if (tag === 9) {
-      // fallback address (tag 'f (9)')
-      const verWord = words[start]; // 1st word = version (5-bit)
-      if (verWord !== 31) {
-        console.warn("Not our custom version-31");
-        i = end;
-        continue;
-      }
+    if (section.name === AMOUNT_MSATS_NAME) {
+      amountSection = section;
+    }
+    if (section.name === PAYMENT_SECRET_NAME) {
+      paymentSecretSection = section;
+    }
+  }
 
-      const payloadWords = words.slice(start + 1, end);
-      const payloadBytes = bech32WordsToBytes(payloadWords);
-
-      fallbackAddress = Buffer.from(payloadBytes).toString("hex");
-    } else if (tag === 16) {
-      // Payment secret (tag 's (16)') - should be 32 bytes (52 words)
-      if (len !== 52) {
-        throw new ValidationError("Invalid payment secret length", {
-          field: "paymentSecret",
-          value: len,
-          expected: "52 words (32 bytes for 256-bit secret)",
-        });
-      }
+  routeHints = decodedInvoice.route_hints;
 
-      const secretWords = words.slice(start, end);
-      const secretBytes = bech32WordsToBytes(secretWords);
+  const amountMSats = amountSection?.value ? BigInt(amountSection.value) : null;
+  const paymentHash = paymentSection?.value as string;
 
-      if (secretBytes.length !== 32) {
-        throw new ValidationError("Invalid payment secret size", {
-          field: "paymentSecret",
-          value: secretBytes.length,
-          expected: "32 bytes (256 bits)",
-        });
+  for (const routeHintArray of routeHints) {
+    for (const routeHint of routeHintArray) {
+      if (
+        routeHint.short_channel_id ===
+        RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID
+      ) {
+        fallbackAddress = routeHint.pubkey;
       }
-
-      paymentSecret = Buffer.from(secretBytes).toString("hex");
     }
-    i = end; // next TLV
   }
+
   if (paymentHash === undefined) {
     throw new ValidationError("No payment hash found in invoice: " + invoice);
   }
-  if (paymentSecret === undefined) {
+  if (paymentSecretSection?.value === undefined) {
     throw new ValidationError(
       "Invalid payment secret found in invoice: " + invoice,
     );
   }
-  return { amountMSats, fallbackAddress, paymentHash };
-}
 
-function bech32WordsToBytes(words: number[]): Uint8Array {
-  let acc = 0,
-    bits = 0;
-  const out: number[] = [];
-  for (const w of words) {
-    if (w < 0 || w > 31) throw new Error(`bad word ${w}`);
-    acc = (acc << 5) | w;
-    bits += 5;
-    while (bits >= 8) {
-      bits -= 8;
-      out.push((acc >> bits) & 0xff);
-    }
-  }
-  return new Uint8Array(out);
+  return { amountMSats, fallbackAddress, paymentHash };
 }
 
 export function getNetworkFromInvoice(invoice: string): Network | null {
@@ -120,109 +94,10 @@ export function getNetworkFromInvoice(invoice: string): Network | null {
   return null;
 }
 
-function extractMillisatoshiAmountFromInvoice(invoice: string): bigint | null {
-  const match = invoice.match(/^ln[a-z]+(\d+)([a-z]?)1/);
-  if (!match) return null;
-
-  const [, amount, multiplier] = match;
-  if (!amount) return null;
-
-  const value = BigInt(amount);
-  const MILLISATS_PER_BTC = 100_000_000_000n;
-
-  const divisors = {
-    m: 1_000n,
-    u: 1_000_000n,
-    n: 1_000_000_000n,
-    p: 10_000_000_000_000n,
-  };
-
-  if (multiplier) {
-    // Validate multiplier is valid
-    if (!(multiplier in divisors)) {
-      throw new ValidationError(`Invalid multiplier: ${multiplier}`, {
-        field: "multiplier",
-        value: multiplier,
-        expected: "valid bolt11 multiplier: m, u, n, p",
-      });
-    }
-
-    const divisor = divisors[multiplier as keyof typeof divisors];
-
-    // Check if division results in fractional millisatoshis
-    if ((value * MILLISATS_PER_BTC) % divisor !== 0n) {
-      throw new ValidationError("Invalid submillisatoshi precision", {
-        field: "amount",
-        value: `${amount}${multiplier}`,
-        expected: "amount must result in whole millisatoshis",
-      });
-    }
-
-    return (value * MILLISATS_PER_BTC) / divisor;
-  } else {
-    return value * MILLISATS_PER_BTC;
-  }
-}
-
-export function hasSparkHeader(bytes: Uint8Array): boolean {
-  if (bytes.length < 3) {
-    return false;
-  }
-
-  return (
-    bytes[0] === 0x53 && // 'S'
-    bytes[1] === 0x50 && // 'P'
-    bytes[2] === 0x4b // 'K'
-  );
-}
-
 export function isValidSparkFallback(bytes: Uint8Array): boolean {
-  // should be 36 bytes (3-byte SPK header + 33-byte identity public key)
-  if (bytes.length !== 36) {
+  // 33-byte identity public key
+  if (bytes.length !== 33) {
     return false;
   }
-  return hasSparkHeader(bytes);
-}
-
-function verifySignature(words: number[], prefix: string) {
-  if (words.length < 104) {
-    throw new ValidationError("Invoice too short for signature");
-  }
-
-  const signatureStart = words.length - 104;
-  const signatureEnd = words.length - 1;
-
-  const hrp = prefix;
-  const hrpBytes = new TextEncoder().encode(hrp);
-
-  const dataWords = words.slice(0, signatureStart);
-  const dataBytes = bech32WordsToBytes(dataWords);
-
-  const sigWords = words.slice(signatureStart, signatureEnd);
-  const sigBytes = bech32WordsToBytes(sigWords);
-  if (sigBytes.length !== 64) {
-    throw new ValidationError("Invalid signature length");
-  }
-
-  const recoveryId = words[words.length - 1];
-  if (recoveryId === undefined) {
-    throw new ValidationError("Missing recovery ID in signature");
-  }
-
-  const messageBytes = new Uint8Array(hrpBytes.length + dataBytes.length);
-  messageBytes.set(hrpBytes, 0);
-  messageBytes.set(dataBytes, hrpBytes.length);
-
-  const messageHash = sha256(messageBytes);
-
-  try {
-    const signature =
-      secp256k1.Signature.fromCompact(sigBytes).addRecoveryBit(recoveryId);
-
-    signature.recoverPublicKey(messageHash);
-  } catch (error) {
-    throw new ValidationError(
-      `Invalid BOLT11 signature: ${(error as Error).message}`,
-    );
-  }
+  return true;
 }

package/src/services/coop-exit.ts

@@ -156,6 +156,9 @@ export class CoopExitService extends BaseTransferService {
           rawTx: refundTx.toBytes(),
           signingNonceCommitment: signingNonceCommitment,
         },
+        // TODO: Add direct refund signature
+        directRefundTxSigningJob: undefined,
+        directFromCpfpRefundTxSigningJob: undefined,
       };
 
       signingJobs.push(signingJob);

package/src/services/lrc20.ts

@@ -19,7 +19,7 @@ export async function broadcastL1Withdrawal(
     ({ output, previousTransactionHash, previousTransactionVout }) => {
       return {
         amount: bytesToNumberBE(output!.tokenAmount),
-        tokenPubkey: bytesToHex(output!.tokenPublicKey),
+        tokenPubkey: bytesToHex(output!.tokenPublicKey!),
         sats: WITHDRAW_BOND_SATS,
         cltvOutputLocktime: WITHDRAW_RELATIVE_BLOCK_LOCKTIME,
         revocationKey: bytesToHex(output!.revocationCommitment!),