@buildonspark/spark-sdk 0.2.9 → 0.2.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @buildonspark/spark-sdk
 
+## 0.2.10
+
+### Patch Changes
+
+- Bug fix for queryNodes
+
 ## 0.2.9
 
 ### Patch Changes

package/dist/bare/index.cjs

@@ -17689,7 +17689,7 @@ var ecies = __toESM(require("eciesjs"), 1);
 var import_core10 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -31531,7 +31531,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -32774,11 +32774,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -32800,10 +32800,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = (0, import_utils23.equalBytes)(
       signerIdentityPublicKey,
@@ -34377,7 +34373,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/bare/index.js

@@ -16311,7 +16311,7 @@ import * as ecies from "eciesjs";
 import { isNode, isBare } from "@lightsparkdev/core";
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -30175,7 +30175,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -31418,11 +31418,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -31444,10 +31444,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = equalBytes6(
       signerIdentityPublicKey,
@@ -33021,7 +33017,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/{chunk-5Y7YILMA.js → chunk-JXLWOQK5.js}

@@ -575,7 +575,7 @@ import * as ecies from "eciesjs";
 import { isNode, isBare } from "@lightsparkdev/core";
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -12371,7 +12371,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -13614,11 +13614,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -13640,10 +13640,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = equalBytes6(
       signerIdentityPublicKey,
@@ -15217,7 +15213,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/{chunk-23BBEC25.js → chunk-MWBK6QBF.js}

@@ -1,7 +1,7 @@
 import {
   SparkWallet,
   setCrypto
-} from "./chunk-5Y7YILMA.js";
+} from "./chunk-JXLWOQK5.js";
 
 // src/spark-wallet/spark-wallet.browser.ts
 import { WebTracerProvider } from "@opentelemetry/sdk-trace-web";

package/dist/debug.cjs

@@ -17684,7 +17684,7 @@ init_buffer();
 var import_core10 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -31457,7 +31457,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -32700,11 +32700,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -32726,10 +32726,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = (0, import_utils23.equalBytes)(
       signerIdentityPublicKey,
@@ -34303,7 +34299,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/debug.js

@@ -2,7 +2,7 @@ import {
   SparkWallet,
   WalletConfig,
   utils_exports
-} from "./chunk-5Y7YILMA.js";
+} from "./chunk-JXLWOQK5.js";
 import "./chunk-6CMNEDBK.js";
 import "./chunk-76SYPHOC.js";
 import "./chunk-A5M55UR3.js";

package/dist/index.cjs

@@ -19301,7 +19301,7 @@ init_buffer();
 var import_core8 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -32244,7 +32244,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -33487,11 +33487,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -33513,10 +33513,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = (0, import_utils24.equalBytes)(
       signerIdentityPublicKey,
@@ -35090,7 +35086,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   SparkWalletBrowser,
   initializeTracerEnvBrowser
-} from "./chunk-23BBEC25.js";
+} from "./chunk-MWBK6QBF.js";
 import "./chunk-BYXBJQAS.js";
 import {
   AuthenticationError,
@@ -114,7 +114,7 @@ import {
   validateShare,
   validateSparkInvoiceFields,
   validateSparkInvoiceSignature
-} from "./chunk-5Y7YILMA.js";
+} from "./chunk-JXLWOQK5.js";
 import "./chunk-6CMNEDBK.js";
 import "./chunk-76SYPHOC.js";
 import "./chunk-A5M55UR3.js";

package/dist/index.node.cjs

@@ -19302,7 +19302,7 @@ init_buffer();
 var import_core8 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -32245,7 +32245,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -33488,11 +33488,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -33514,10 +33514,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = (0, import_utils24.equalBytes)(
       signerIdentityPublicKey,
@@ -35091,7 +35087,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/index.node.js

@@ -112,7 +112,7 @@ import {
   validateShare,
   validateSparkInvoiceFields,
   validateSparkInvoiceSignature
-} from "./chunk-5Y7YILMA.js";
+} from "./chunk-JXLWOQK5.js";
 import "./chunk-6CMNEDBK.js";
 import "./chunk-76SYPHOC.js";
 import "./chunk-A5M55UR3.js";

package/dist/native/index.cjs

@@ -19427,7 +19427,7 @@ init_buffer();
 var import_core8 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -32300,7 +32300,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -33543,11 +33543,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -33569,10 +33569,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = (0, import_utils24.equalBytes)(
       signerIdentityPublicKey,
@@ -35146,7 +35142,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/native/index.js

@@ -17929,7 +17929,7 @@ import * as ecies from "eciesjs";
 import { isNode, isBare } from "@lightsparkdev/core";
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -30774,7 +30774,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       throw new Error("targetAmount or leaves must be provided");
     }
     leavesToSwap.sort((a, b) => a.value - b.value);
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
     const results = [];
     for (const batch of batches) {
       const result = await this.processSwapBatch(batch, targetAmounts);
@@ -32017,11 +32017,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         field: "receiverSparkAddress"
       });
     }
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType()
     );
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -32043,10 +32043,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         value: amountSats
       });
     }
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType()
-    );
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = equalBytes6(
       signerIdentityPublicKey,
@@ -33620,7 +33616,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
       Object.assign(aggregatedNodes, response.nodes ?? {});
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset

package/dist/tests/test-utils.cjs

@@ -16372,7 +16372,7 @@ init_buffer();
 var import_core8 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.9" : "unknown";
+var packageVersion = true ? "0.2.10" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";

package/dist/tests/test-utils.js

@@ -1,4 +1,4 @@
-import "../chunk-23BBEC25.js";
+import "../chunk-MWBK6QBF.js";
 import "../chunk-BYXBJQAS.js";
 import {
   BitcoinFaucet,
@@ -11,7 +11,7 @@ import {
   WalletConfigService,
   getNetwork,
   getP2TRAddressFromPublicKey
-} from "../chunk-5Y7YILMA.js";
+} from "../chunk-JXLWOQK5.js";
 import "../chunk-6CMNEDBK.js";
 import "../chunk-76SYPHOC.js";
 import "../chunk-A5M55UR3.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildonspark/spark-sdk",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "author": "",
   "license": "Apache-2.0",
   "main": "./dist/index.js",

package/src/spark-wallet/spark-wallet.ts

@@ -1086,7 +1086,7 @@ export class SparkWallet extends EventEmitter {
 
     leavesToSwap.sort((a, b) => a.value - b.value);
 
-    const batches = chunkArray(leavesToSwap, 100);
+    const batches = chunkArray(leavesToSwap, 64);
 
     const results: TreeNode[] = [];
     for (const batch of batches) {
@@ -2618,12 +2618,12 @@ export class SparkWallet extends EventEmitter {
       });
     }
 
-    const addressData = decodeSparkAddress(
+    const receiverAddress = decodeSparkAddress(
       receiverSparkAddress,
       this.config.getNetworkType(),
     );
 
-    if (addressData.sparkInvoiceFields) {
+    if (receiverAddress.sparkInvoiceFields) {
       throw new ValidationError(
         "Spark address is a Spark invoice. Use fulfillSparkInvoice instead.",
         {
@@ -2648,11 +2648,6 @@ export class SparkWallet extends EventEmitter {
       });
     }
 
-    const receiverAddress = decodeSparkAddress(
-      receiverSparkAddress,
-      this.config.getNetworkType(),
-    );
-
     const signerIdentityPublicKey =
       await this.config.signer.getIdentityPublicKey();
 
@@ -4652,7 +4647,7 @@ export class SparkWallet extends EventEmitter {
 
       /* If we received fewer nodes than requested, this was the last page. */
       const received = Object.keys(response.nodes ?? {}).length;
-      if (received < pageSize) {
+      if (received < pageSize || baseRequest.source?.$case === "nodeIds") {
         return {
           nodes: aggregatedNodes,
           offset: response.offset,

package/src/tests/integration/lightning.test.ts

@@ -216,7 +216,7 @@ describe.each(walletTypes)(
 
       expect(senderTransfer).toBeDefined();
 
-      const transfer = await sspTransferService.sendTransferTweakKey(
+      const transfer = await sspTransferService.deliverTransferPackage(
         senderTransfer!,
         leaves,
         new Map(),
@@ -409,7 +409,7 @@ describe.each(walletTypes)(
 
       expect(response.transfer).toBeDefined();
 
-      const transfer = await transferService.sendTransferTweakKey(
+      const transfer = await transferService.deliverTransferPackage(
         response.transfer!,
         leaves,
         new Map(),

package/src/tests/integration/swap.test.ts

@@ -347,7 +347,7 @@ describe.each(walletTypes)("swap", ({ name, Signer, createTree }) => {
       }
 
       const senderTransferTweakKey =
-        await aliceTransferService.sendTransferTweakKey(
+        await aliceTransferService.deliverTransferPackage(
           aliceTransfer,
           aliceLeavesToTransfer,
           aliceRefundSignatureMap,
@@ -386,7 +386,7 @@ describe.each(walletTypes)("swap", ({ name, Signer, createTree }) => {
       );
 
       const senderTransferTweakKey2 =
-        await bobTransferService.sendTransferTweakKey(
+        await bobTransferService.deliverTransferPackage(
           bobTransfer,
           receiverLeavesToTransfer,
           newReceiverRefundSignatureMap,

package/src/tests/integration/transfer.test.ts

@@ -95,10 +95,11 @@ describe.each(walletTypes)(
         newKeyDerivation: newLeafDerivationPath,
       };
 
-      const senderTransfer = await senderTransferService.sendTransfer(
-        [transferNode],
-        hexToBytes(receiverPubkey),
-      );
+      const senderTransfer =
+        await senderTransferService.sendTransferWithKeyTweaks(
+          [transferNode],
+          hexToBytes(receiverPubkey),
+        );
 
       const pendingTransfer = await receiverWallet.queryPendingTransfers();
 
@@ -213,10 +214,11 @@ describe.each(walletTypes)(
 
       const leavesToTransfer = [transferNode];
 
-      const senderTransfer = await senderTransferService.sendTransfer(
-        leavesToTransfer,
-        hexToBytes(receiverPubkey),
-      );
+      const senderTransfer =
+        await senderTransferService.sendTransferWithKeyTweaks(
+          leavesToTransfer,
+          hexToBytes(receiverPubkey),
+        );
 
       // Receiver queries pending transfer
       const pendingTransfer = await receiverWallet.queryPendingTransfers();
@@ -382,10 +384,11 @@ describe.each(walletTypes)(
         senderConfigService.getCoordinatorAddress(),
       );
 
-      const newSenderTransfer = await senderTransferService.sendTransfer(
-        [transferNode],
-        hexToBytes(receiverPubkey),
-      );
+      const newSenderTransfer =
+        await senderTransferService.sendTransferWithKeyTweaks(
+          [transferNode],
+          hexToBytes(receiverPubkey),
+        );
 
       const pendingTransfer = await receiverWallet.queryPendingTransfers();
       expect(pendingTransfer.transfers.length).toBe(1);
@@ -512,10 +515,11 @@ describe.each(walletTypes)(
           newKeyDerivation: newLeafDerivationPath,
         };
 
-        const senderTransfer = await senderTransferService.sendTransfer(
-          [transferNode],
-          hexToBytes(receiverPubkey),
-        );
+        const senderTransfer =
+          await senderTransferService.sendTransferWithKeyTweaks(
+            [transferNode],
+            hexToBytes(receiverPubkey),
+          );
 
         const pendingTransfer = await receiverWallet.queryPendingTransfers();