@atomiqlabs/sdk 8.6.2 → 8.6.3

package/dist/http/paramcoders/ParamDecoder.js

@@ -2,6 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParamDecoder = void 0;
 const buffer_1 = require("buffer");
+function ensureBuffer(input) {
+    if (input instanceof buffer_1.Buffer)
+        return input;
+    return buffer_1.Buffer.from(input);
+}
 class ParamDecoder {
     constructor() {
         this.frameData = [];
@@ -48,8 +53,8 @@ class ParamDecoder {
                     leavesBuffer = null;
                 }
                 else {
-                    this.frameHeader = leavesBuffer.subarray(0, 4);
-                    leavesBuffer = leavesBuffer.subarray(4);
+                    this.frameHeader = ensureBuffer(leavesBuffer.subarray(0, 4));
+                    leavesBuffer = ensureBuffer(leavesBuffer.subarray(4));
                 }
             }
             else if (this.frameHeader.length < 4) {
@@ -60,14 +65,14 @@ class ParamDecoder {
                 }
                 else {
                     this.frameHeader = buffer_1.Buffer.concat([this.frameHeader, leavesBuffer.subarray(0, requiredLen)]);
-                    leavesBuffer = leavesBuffer.subarray(requiredLen);
+                    leavesBuffer = ensureBuffer(leavesBuffer.subarray(requiredLen));
                 }
             }
             if (leavesBuffer == null)
                 continue;
             if (this.frameHeader == null || this.frameHeader.length < 4)
                 continue;
-            const frameLength = this.frameHeader.readUint32LE();
+            const frameLength = this.frameHeader.readUint32LE != null ? this.frameHeader.readUint32LE() : this.frameHeader.readUInt32LE();
             const requiredLen = frameLength - this.frameDataLength;
             if (leavesBuffer.length <= requiredLen) {
                 this.frameData.push(leavesBuffer);

package/dist/http/paramcoders/ParamEncoder.js

@@ -15,7 +15,12 @@ class ParamEncoder {
     writeParams(data) {
         const serialized = buffer_1.Buffer.from(JSON.stringify(data));
         const frameLengthBuffer = buffer_1.Buffer.alloc(4);
-        frameLengthBuffer.writeUint32LE(serialized.length);
+        if (frameLengthBuffer.writeUint32LE != null) {
+            frameLengthBuffer.writeUint32LE(serialized.length);
+        }
+        else {
+            frameLengthBuffer.writeUInt32LE(serialized.length);
+        }
         return this.writeFN(buffer_1.Buffer.concat([
             frameLengthBuffer,
             serialized

package/dist/intermediaries/IntermediaryDiscovery.js

@@ -129,7 +129,7 @@ class IntermediaryDiscovery extends events_1.EventEmitter {
      * @param abortSignal
      */
     async getNodeInfo(url, abortSignal) {
-        const response = await (0, RetryUtils_1.tryWithRetries)(() => IntermediaryAPI_1.IntermediaryAPI.getIntermediaryInfo(url, this.httpRequestTimeout, abortSignal), { maxRetries: 3, delay: 100, exponential: true }, undefined, abortSignal);
+        const response = await (0, RetryUtils_1.tryWithRetries)(() => IntermediaryAPI_1.IntermediaryAPI.getIntermediaryInfo(url, this.httpRequestTimeout, abortSignal), { maxRetries: 3, delay: 100, exponential: true }, undefined, abortSignal, "debug");
         abortSignal?.throwIfAborted();
         const promises = [];
         const addresses = {};
@@ -142,7 +142,7 @@ class IntermediaryDiscovery extends events_1.EventEmitter {
                         addresses[chain] = address;
                     }
                     catch (e) {
-                        logger.warn("Failed to verify " + chain + " signature for intermediary: " + url);
+                        logger.warn("getNodeInfo(): Failed to verify " + chain + " signature for intermediary: " + url);
                     }
                 })());
             }
@@ -191,7 +191,8 @@ class IntermediaryDiscovery extends events_1.EventEmitter {
             return new Intermediary_1.Intermediary(url, nodeInfo.addresses, services);
         }
         catch (e) {
-            logger.warn("fetchIntermediaries(): Error contacting intermediary " + url + ": ", e);
+            logger.warn("fetchIntermediaries(): Intermediary " + url + ` is unreachable due to ${e.name ?? e.message} error, skipping...`);
+            logger.debug("fetchIntermediaries(): Error contacting intermediary " + url + ": ", e);
             return null;
         }
     }

package/dist/swapper/Swapper.js

@@ -182,7 +182,7 @@ class Swapper extends events_1.EventEmitter {
         });
     }
     async _init() {
-        this.logger.debug("init(): Initializing swapper, sdk-lib version 16.1.3");
+        this.logger.debug("init(): Initializing swapper...");
         const abortController = new AbortController();
         const promises = [];
         let automaticClockDriftCorrectionPromise = undefined;
@@ -218,7 +218,11 @@ class Swapper extends events_1.EventEmitter {
         const chainPromises = [];
         for (let chainIdentifier in this._chains) {
             chainPromises.push((async () => {
-                const { swapContract, unifiedChainEvents, unifiedSwapStorage, wrappers, reviver } = this._chains[chainIdentifier];
+                const { chainInterface, swapContract, unifiedChainEvents, unifiedSwapStorage, wrappers, reviver } = this._chains[chainIdentifier];
+                const _chainInterface = chainInterface;
+                if (_chainInterface.verifyNetwork != null) {
+                    await _chainInterface.verifyNetwork(this.bitcoinNetwork);
+                }
                 await swapContract.start();
                 this.logger.debug("init(): Intialized swap contract: " + chainIdentifier);
                 await unifiedSwapStorage.init();

package/dist/utils/RetryUtils.d.ts

@@ -10,6 +10,7 @@ type Constructor<T = any> = new (...args: any[]) => T;
  * @param retryPolicy.exponential Whether to use exponentially increasing delays
  * @param errorAllowed A callback for determining whether a given error is allowed, and we should therefore not retry
  * @param abortSignal
+ * @param failureLogLevel
  * @returns Result of the action executing callback
  * @category Utilities
  */
@@ -17,5 +18,5 @@ export declare function tryWithRetries<T>(func: (retryCount: number) => Promise<
     maxRetries?: number;
     delay?: number;
     exponential?: boolean;
-}, errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[], abortSignal?: AbortSignal): Promise<T>;
+}, errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[], abortSignal?: AbortSignal, failureLogLevel?: "debug" | "info" | "warn" | "error"): Promise<T>;
 export {};

package/dist/utils/RetryUtils.js

@@ -36,10 +36,11 @@ function checkError(e, errorAllowed) {
  * @param retryPolicy.exponential Whether to use exponentially increasing delays
  * @param errorAllowed A callback for determining whether a given error is allowed, and we should therefore not retry
  * @param abortSignal
+ * @param failureLogLevel
  * @returns Result of the action executing callback
  * @category Utilities
  */
-async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
+async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal, failureLogLevel = "warn") {
     retryPolicy = retryPolicy || {};
     retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
     retryPolicy.delay = retryPolicy.delay || 500;
@@ -53,7 +54,7 @@ async function tryWithRetries(func, retryPolicy, errorAllowed, abortSignal) {
             if (errorAllowed != null && checkError(e, errorAllowed))
                 throw e;
             err = e;
-            logger.debug("tryWithRetries(): Error on try number: " + i, e);
+            logger[failureLogLevel]("tryWithRetries(): Error on try number: " + i, e);
         }
         if (abortSignal != null && abortSignal.aborted)
             throw (abortSignal.reason || new Error("Aborted"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/sdk",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/http/paramcoders/ParamDecoder.ts

@@ -1,6 +1,10 @@
 import {IParamReader} from "./IParamReader";
 import {Buffer} from "buffer";
 
+function ensureBuffer(input: any): Buffer {
+    if(input instanceof Buffer) return input;
+    return Buffer.from(input);
+}
 
 export class ParamDecoder implements IParamReader {
 
@@ -56,8 +60,8 @@ export class ParamDecoder implements IParamReader {
                     this.frameHeader = leavesBuffer;
                     leavesBuffer = null;
                 } else {
-                    this.frameHeader = leavesBuffer.subarray(0, 4);
-                    leavesBuffer = leavesBuffer.subarray(4);
+                    this.frameHeader = ensureBuffer(leavesBuffer.subarray(0, 4));
+                    leavesBuffer = ensureBuffer(leavesBuffer.subarray(4));
                 }
             } else if(this.frameHeader.length<4) {
                 const requiredLen = 4-this.frameHeader.length;
@@ -66,13 +70,13 @@ export class ParamDecoder implements IParamReader {
                     leavesBuffer = null;
                 } else {
                     this.frameHeader = Buffer.concat([this.frameHeader, leavesBuffer.subarray(0, requiredLen)]);
-                    leavesBuffer = leavesBuffer.subarray(requiredLen);
+                    leavesBuffer = ensureBuffer(leavesBuffer.subarray(requiredLen));
                 }
             }
             if(leavesBuffer==null) continue;
             if(this.frameHeader==null || this.frameHeader.length<4) continue;
 
-            const frameLength = this.frameHeader.readUint32LE();
+            const frameLength = this.frameHeader.readUint32LE!=null ? this.frameHeader.readUint32LE() : this.frameHeader.readUInt32LE();
             const requiredLen = frameLength-this.frameDataLength;
 
             if(leavesBuffer.length<=requiredLen) {

package/src/http/paramcoders/ParamEncoder.ts

@@ -19,7 +19,11 @@ export class ParamEncoder {
         const serialized: Buffer = Buffer.from(JSON.stringify(data));
 
         const frameLengthBuffer = Buffer.alloc(4);
-        frameLengthBuffer.writeUint32LE(serialized.length);
+        if(frameLengthBuffer.writeUint32LE!=null) {
+            frameLengthBuffer.writeUint32LE(serialized.length);
+        } else {
+            frameLengthBuffer.writeUInt32LE(serialized.length);
+        }
 
         return this.writeFN(Buffer.concat([
             frameLengthBuffer,

package/src/intermediaries/IntermediaryDiscovery.ts

@@ -241,7 +241,8 @@ export class IntermediaryDiscovery extends EventEmitter {
             () => IntermediaryAPI.getIntermediaryInfo(url, this.httpRequestTimeout, abortSignal),
             {maxRetries: 3, delay: 100, exponential: true},
             undefined,
-            abortSignal
+            abortSignal,
+            "debug"
         );
         abortSignal?.throwIfAborted();
 
@@ -255,7 +256,7 @@ export class IntermediaryDiscovery extends EventEmitter {
                         await this.swapContracts[chain].isValidDataSignature(Buffer.from(response.envelope), signature, address);
                         addresses[chain] = address;
                     } catch (e) {
-                        logger.warn("Failed to verify "+chain+" signature for intermediary: "+url);
+                        logger.warn("getNodeInfo(): Failed to verify "+chain+" signature for intermediary: "+url);
                     }
                 })());
             }
@@ -303,8 +304,9 @@ export class IntermediaryDiscovery extends EventEmitter {
                 services[swapHandlerTypeToSwapType(key as SwapHandlerType)] = nodeInfo.info.services[key as SwapHandlerType];
             }
             return new Intermediary(url, nodeInfo.addresses, services);
-        } catch (e) {
-            logger.warn("fetchIntermediaries(): Error contacting intermediary "+url+": ", e);
+        } catch (e: any) {
+            logger.warn("fetchIntermediaries(): Intermediary "+url+` is unreachable due to ${e.name ?? e.message} error, skipping...`);
+            logger.debug("fetchIntermediaries(): Error contacting intermediary "+url+": ", e);
             return null;
         }
     }

package/src/swapper/Swapper.ts

@@ -553,7 +553,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
     }
 
     private async _init(): Promise<void> {
-        this.logger.debug("init(): Initializing swapper, sdk-lib version 16.1.3");
+        this.logger.debug("init(): Initializing swapper...");
 
         const abortController = new AbortController();
 
@@ -594,12 +594,19 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
         for(let chainIdentifier in this._chains) {
             chainPromises.push((async() => {
                 const {
+                    chainInterface,
                     swapContract,
                     unifiedChainEvents,
                     unifiedSwapStorage,
                     wrappers,
                     reviver
                 } = this._chains[chainIdentifier];
+
+                const _chainInterface: any = chainInterface;
+                if(_chainInterface.verifyNetwork!=null) {
+                    await _chainInterface.verifyNetwork(this.bitcoinNetwork);
+                }
+
                 await swapContract.start();
                 this.logger.debug("init(): Intialized swap contract: "+chainIdentifier);
 

package/src/utils/RetryUtils.ts

@@ -40,12 +40,19 @@ function checkError(e: any, errorAllowed: ((e: any) => boolean) | Constructor<Er
  * @param retryPolicy.exponential Whether to use exponentially increasing delays
  * @param errorAllowed A callback for determining whether a given error is allowed, and we should therefore not retry
  * @param abortSignal
+ * @param failureLogLevel
  * @returns Result of the action executing callback
  * @category Utilities
  */
-export async function tryWithRetries<T>(func: (retryCount: number) => Promise<T>, retryPolicy?: {
-    maxRetries?: number, delay?: number, exponential?: boolean
-}, errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[], abortSignal?: AbortSignal): Promise<T> {
+export async function tryWithRetries<T>(
+    func: (retryCount: number) => Promise<T>,
+    retryPolicy?: {
+        maxRetries?: number, delay?: number, exponential?: boolean
+    },
+    errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[],
+    abortSignal?: AbortSignal,
+    failureLogLevel: "debug" | "info" | "warn" | "error" = "warn"
+): Promise<T> {
     retryPolicy = retryPolicy || {};
     retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
     retryPolicy.delay = retryPolicy.delay || 500;
@@ -59,7 +66,7 @@ export async function tryWithRetries<T>(func: (retryCount: number) => Promise<T>
         } catch (e) {
             if (errorAllowed != null && checkError(e, errorAllowed)) throw e;
             err = e;
-            logger.debug("tryWithRetries(): Error on try number: " + i, e);
+            logger[failureLogLevel]("tryWithRetries(): Error on try number: " + i, e);
         }
         if (abortSignal != null && abortSignal.aborted) throw (abortSignal.reason || new Error("Aborted"));
         if (i !== retryPolicy.maxRetries - 1) {