@atomiqlabs/sdk 8.6.0 → 8.6.3

package/dist/swaps/spv_swaps/SpvFromBTCSwap.d.ts

@@ -601,6 +601,7 @@ export declare class SpvFromBTCSwap<T extends ChainType> extends ISwap<T, SpvFro
      * @internal
      */
     _setBitcoinTxId(txId: string): Promise<void>;
+    private btcTxLastChecked?;
     /**
      * @internal
      */

package/dist/swaps/spv_swaps/SpvFromBTCSwap.js

@@ -227,7 +227,7 @@ class SpvFromBTCSwap extends ISwap_1.ISwap {
      */
     upgradeVersion() {
         if (this.version === 1) {
-            this.posted = this.initiated;
+            this.posted = this.initiated && this._data != null;
             this.version = 2;
         }
     }
@@ -1244,6 +1244,7 @@ class SpvFromBTCSwap extends ISwap_1.ISwap {
         if (this._data?.btcTx == null)
             return false;
         //Check if bitcoin payment was confirmed
+        this.btcTxLastChecked = Date.now();
         const res = await this.getBitcoinPayment();
         if (res == null) {
             //Check inputs double-spent
@@ -1379,7 +1380,7 @@ class SpvFromBTCSwap extends ISwap_1.ISwap {
                 return true;
             }
         }
-        if (Math.floor(Date.now() / 1000) % 120 === 0) {
+        if (this.btcTxLastChecked == null || Date.now() - this.btcTxLastChecked > 120000) {
             if (this._state === SpvFromBTCSwapState.POSTED ||
                 this._state === SpvFromBTCSwapState.BROADCASTED) {
                 try {

package/dist/swaps/spv_swaps/SpvFromBTCWrapper.js

@@ -39,6 +39,7 @@ class SpvFromBTCWrapper extends ISwapWrapper_1.ISwapWrapper {
      */
     constructor(chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, spvWithdrawalDataDeserializer, btcRelay, synchronizer, btcRpc, options, events) {
         super(chainIdentifier, unifiedStorage, unifiedChainEvents, chain, prices, tokens, {
+            ...options,
             bitcoinNetwork: options?.bitcoinNetwork ?? utils_1.TEST_NETWORK,
             maxConfirmations: options?.maxConfirmations ?? 6,
             bitcoinBlocktime: options?.bitcoinBlocktime ?? 10 * 60,
@@ -89,7 +90,6 @@ class SpvFromBTCWrapper extends ISwapWrapper_1.ISwapWrapper {
             swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.BROADCASTED || swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.DECLINED ||
             swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED || swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.BTC_TX_CONFIRMED) {
             swap._state = SpvFromBTCSwap_1.SpvFromBTCSwapState.FRONTED;
-            swap._frontTxId = event.meta?.txId;
             await swap._setBitcoinTxId(event.btcTxId).catch(e => {
                 this.logger.warn("processEventFront(): Failed to set bitcoin txId: ", e);
             });
@@ -103,7 +103,6 @@ class SpvFromBTCWrapper extends ISwapWrapper_1.ISwapWrapper {
             swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED || swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.FRONTED ||
             swap._state === SpvFromBTCSwap_1.SpvFromBTCSwapState.BTC_TX_CONFIRMED) {
             swap._state = SpvFromBTCSwap_1.SpvFromBTCSwapState.CLAIMED;
-            swap._claimTxId = event.meta?.txId;
             await swap._setBitcoinTxId(event.btcTxId).catch(e => {
                 this.logger.warn("processEventClaim(): Failed to set bitcoin txId: ", e);
             });
@@ -506,7 +505,6 @@ class SpvFromBTCWrapper extends ISwapWrapper_1.ISwapWrapper {
                             genesisSmartChainBlockHeight: await (0, Utils_1.throwIfUndefined)(finalizedBlockHeightPrefetchPromise, "Finalize block height promise failed!")
                         };
                         const quote = new SpvFromBTCSwap_1.SpvFromBTCSwap(this, swapInit);
-                        await quote._save();
                         return quote;
                     }
                     catch (e) {

package/dist/swaps/trusted/ln/LnForGasWrapper.js

@@ -76,7 +76,6 @@ class LnForGasWrapper extends ISwapWrapper_1.ISwapWrapper {
             exactIn: false
         };
         const quote = new LnForGasSwap_1.LnForGasSwap(this, quoteInit);
-        await quote._save();
         return quote;
     }
 }

package/dist/swaps/trusted/onchain/OnchainForGasWrapper.js

@@ -86,7 +86,6 @@ class OnchainForGasWrapper extends ISwapWrapper_1.ISwapWrapper {
             exactIn: false,
             token
         });
-        await quote._save();
         return quote;
     }
 }

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.0",
+  "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/storage/UnifiedSwapStorage.ts

@@ -89,6 +89,7 @@ export class UnifiedSwapStorage<T extends ChainType> {
             }
             const value = reviver(rawObj);
             if(value==null) return;
+            value._persisted = true;
             if(!this.noWeakRefMap) this.weakRefCache.set(rawObj.id, new WeakRef<ISwap<T>>(value));
             result.push(value);
         });
@@ -101,36 +102,40 @@ export class UnifiedSwapStorage<T extends ChainType> {
      *
      * @param value Swap to save
      */
-    save<S extends ISwap<T>>(value: S): Promise<void> {
+    async save<S extends ISwap<T>>(value: S): Promise<void> {
         if(!this.noWeakRefMap) this.weakRefCache.set(value.getId(), new WeakRef<ISwap<T>>(value));
-        return this.storage.save(value.serialize());
+        await this.storage.save(value.serialize());
+        value._persisted = true;
     }
 
     /**
      * Saves multiple swaps to storage in a batch operation
      * @param values Array of swaps to save
      */
-    saveAll<S extends ISwap<T>>(values: S[]): Promise<void> {
+    async saveAll<S extends ISwap<T>>(values: S[]): Promise<void> {
         if(!this.noWeakRefMap) values.forEach(value => this.weakRefCache.set(value.getId(), new WeakRef<ISwap<T>>(value)));
-        return this.storage.saveAll(values.map(obj => obj.serialize()));
+        await this.storage.saveAll(values.map(obj => obj.serialize()));
+        values.forEach(value => value._persisted = true);
     }
 
     /**
      * Removes a swap from storage
      * @param value Swap to remove
      */
-    remove<S extends ISwap<T>>(value: S): Promise<void> {
+    async remove<S extends ISwap<T>>(value: S): Promise<void> {
         if(!this.noWeakRefMap) this.weakRefCache.delete(value.getId());
-        return this.storage.remove(value.serialize());
+        await this.storage.remove(value.serialize());
+        value._persisted = false;
     }
 
     /**
      * Removes multiple swaps from storage in a batch operation
      * @param values Array of swaps to remove
      */
-    removeAll<S extends ISwap<T>>(values: S[]): Promise<void> {
+    async removeAll<S extends ISwap<T>>(values: S[]): Promise<void> {
         if(!this.noWeakRefMap) values.forEach(value => this.weakRefCache.delete(value.getId()));
-        return this.storage.removeAll(values.map(obj => obj.serialize()));
+        await this.storage.removeAll(values.map(obj => obj.serialize()));
+        values.forEach(value => value._persisted = false);
     }
 
 }

package/src/swapper/Swapper.ts

@@ -316,7 +316,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
         bitcoinSynchronizer: (btcRelay: BtcRelay<any, any, any>) => RelaySynchronizer<any, any, any>,
         chainsData: CtorMultiChainData<T>,
         pricing: ISwapPrice<T>,
-        tokens: SwapperCtorTokens<T>,
+        tokens: SCToken[],
         messenger: Messenger,
         options?: SwapperOptions
     ) {
@@ -347,22 +347,10 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
         this._tokens = {};
         this._tokensByTicker = {};
         for(let tokenData of tokens) {
-            for(let chainId in tokenData.chains) {
-                const chainData = tokenData.chains[chainId]!;
-                this._tokens[chainId] ??= {};
-                this._tokensByTicker[chainId] ??= {};
-                this._tokens[chainId][chainData.address] = this._tokensByTicker[chainId][tokenData.ticker] = {
-                    chain: "SC",
-                    chainId,
-                    ticker: tokenData.ticker,
-                    name: tokenData.name,
-                    decimals: chainData.decimals,
-                    displayDecimals: chainData.displayDecimals,
-                    address: chainData.address,
-                    equals: (other: Token) => other.chainId===chainId && other.ticker===tokenData.ticker && other.address===chainData.address,
-                    toString: () => `${chainId}-${tokenData.ticker}`
-                }
-            }
+            const chainId = tokenData.chainId;
+            this._tokens[chainId] ??= {};
+            this._tokensByTicker[chainId] ??= {};
+            this._tokens[chainId][tokenData.address] = this._tokensByTicker[chainId][tokenData.ticker] = tokenData;
         }
 
         this.swapStateListener = (swap: ISwap) => {
@@ -395,6 +383,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
                     postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                 }
             );
             wrappers[SwapType.TO_BTC] = new ToBTCWrapper<T[InputKey]>(
@@ -410,6 +399,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
                     postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                     bitcoinNetwork: this._btcNetwork
                 }
             );
@@ -426,6 +416,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
                     postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                     unsafeSkipLnNodeCheck: this.bitcoinNetwork===BitcoinNetwork.TESTNET4 || this.bitcoinNetwork===BitcoinNetwork.REGTEST
                 }
             );
@@ -444,6 +435,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
                     postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                     bitcoinNetwork: this._btcNetwork
                 }
             );
@@ -456,7 +448,8 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 this._tokens[chainId],
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
-                    postRequestTimeout: this.options.postRequestTimeout
+                    postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                 }
             );
             wrappers[SwapType.TRUSTED_FROM_BTC] = new OnchainForGasWrapper<T[InputKey]>(
@@ -470,6 +463,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                 {
                     getRequestTimeout: this.options.getRequestTimeout,
                     postRequestTimeout: this.options.postRequestTimeout,
+                    saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                     bitcoinNetwork: this._btcNetwork
                 }
             );
@@ -490,6 +484,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                     {
                         getRequestTimeout: this.options.getRequestTimeout,
                         postRequestTimeout: this.options.postRequestTimeout,
+                        saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                         bitcoinNetwork: this._btcNetwork
                     }
                 );
@@ -510,6 +505,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
                     {
                         getRequestTimeout: this.options.getRequestTimeout,
                         postRequestTimeout: this.options.postRequestTimeout,
+                        saveUninitializedSwaps: this.options.saveUninitializedSwaps,
                         unsafeSkipLnNodeCheck: this.bitcoinNetwork===BitcoinNetwork.TESTNET4 || this.bitcoinNetwork===BitcoinNetwork.REGTEST
                     }
                 );
@@ -557,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();
 
@@ -598,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);
 
@@ -659,7 +662,10 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
      */
     async init(): Promise<void> {
         if(this.initialized) return;
-        if(this.initPromise!=null) await this.initPromise;
+        if(this.initPromise!=null) {
+            await this.initPromise;
+            return;
+        }
 
         try {
             const promise = this._init();
@@ -856,10 +862,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
             if(swapLimitsChanged) this.emit("swapLimitsChanged");
 
             const quote = quotes[0].quote;
-            if(this.options.saveUninitializedSwaps) {
-                quote._setInitiated();
-                await quote._save();
-            }
+            await quote._save();
             return quote;
         } catch (e) {
             if(swapLimitsChanged) this.emit("swapLimitsChanged");
@@ -1334,13 +1337,15 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
      * @param trustedIntermediaryOrUrl  URL or Intermediary object of the trusted intermediary to use, otherwise uses default
      * @throws {Error} If no trusted intermediary specified
      */
-    createTrustedLNForGasSwap<C extends ChainIds<T>>(chainIdentifier: C, recipient: string, amount: bigint, trustedIntermediaryOrUrl?: Intermediary | string): Promise<LnForGasSwap<T[C]>> {
+    async createTrustedLNForGasSwap<C extends ChainIds<T>>(chainIdentifier: C, recipient: string, amount: bigint, trustedIntermediaryOrUrl?: Intermediary | string): Promise<LnForGasSwap<T[C]>> {
         if(this._chains[chainIdentifier]==null) throw new Error("Invalid chain identifier! Unknown chain: "+chainIdentifier);
         if(!this._chains[chainIdentifier].chainInterface.isValidAddress(recipient, true)) throw new Error("Invalid "+chainIdentifier+" address");
         recipient = this._chains[chainIdentifier].chainInterface.normalizeAddress(recipient);
         const useUrl = trustedIntermediaryOrUrl ?? this.defaultTrustedIntermediary ?? this.options.defaultTrustedIntermediaryUrl;
         if(useUrl==null) throw new Error("No trusted intermediary specified!");
-        return this._chains[chainIdentifier as C].wrappers[SwapType.TRUSTED_FROM_BTCLN].create(recipient, amount, useUrl);
+        const swap = await this._chains[chainIdentifier as C].wrappers[SwapType.TRUSTED_FROM_BTCLN].create(recipient, amount, useUrl);
+        await swap._save();
+        return swap;
     }
 
     /**
@@ -1353,7 +1358,7 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
      * @param trustedIntermediaryOrUrl URL or Intermediary object of the trusted intermediary to use, otherwise uses default
      * @throws {Error} If no trusted intermediary specified
      */
-    createTrustedOnchainForGasSwap<C extends ChainIds<T>>(
+    async createTrustedOnchainForGasSwap<C extends ChainIds<T>>(
         chainIdentifier: C, recipient: string,
         amount: bigint, refundAddress?: string,
         trustedIntermediaryOrUrl?: Intermediary | string
@@ -1363,7 +1368,9 @@ export class Swapper<T extends MultiChain> extends EventEmitter<{
         recipient = this._chains[chainIdentifier].chainInterface.normalizeAddress(recipient);
         const useUrl = trustedIntermediaryOrUrl ?? this.defaultTrustedIntermediary ?? this.options.defaultTrustedIntermediaryUrl;
         if(useUrl==null) throw new Error("No trusted intermediary specified!");
-        return this._chains[chainIdentifier as C].wrappers[SwapType.TRUSTED_FROM_BTC].create(recipient, amount, useUrl, refundAddress);
+        const swap = await this._chains[chainIdentifier as C].wrappers[SwapType.TRUSTED_FROM_BTC].create(recipient, amount, useUrl, refundAddress);
+        await swap._save();
+        return swap;
     }
 
     /**

package/src/swapper/SwapperFactory.ts

@@ -9,7 +9,7 @@ import {SmartChainAssets, SmartChainAssetTickers} from "../SmartChainAssets";
 import {NostrMessenger} from "@atomiqlabs/messenger-nostr";
 import {Swapper, SwapperOptions} from "./Swapper";
 import {CustomPriceProvider} from "../prices/providers/CustomPriceProvider";
-import {BitcoinTokens, BtcToken, SCToken} from "../types/Token";
+import {BitcoinTokens, BtcToken, SCToken, Token} from "../types/Token";
 import {SwapType} from "../enums/SwapType";
 import {SwapTypeMapping} from "../utils/SwapUtils";
 import {RedundantSwapPrice, RedundantSwapPriceAssets} from "../prices/RedundantSwapPrice";
@@ -191,6 +191,8 @@ export class SwapperFactory<T extends readonly ChainInitializer<any, ChainType,
      */
     TokenResolver: TypedTokenResolvers<T> = {} as any;
 
+    private smartChainTokens: SCToken[] = [];
+
     constructor(readonly initializers: T) {
         this.initializers = initializers;
         initializers.forEach(initializer => {
@@ -200,15 +202,19 @@ export class SwapperFactory<T extends readonly ChainInitializer<any, ChainType,
 
             for(let ticker in initializer.tokens) {
                 const assetData = initializer.tokens[ticker] as any;
-                tokens[ticker] = addressMap[assetData.address] = {
+                const token: SCToken = {
                     chain: "SC",
                     chainId: initializer.chainId,
-                    address: assetData.address,
+                    ticker,
                     name: SmartChainAssets[ticker as SmartChainAssetTickers]?.name ?? ticker,
                     decimals: assetData.decimals,
                     displayDecimals: assetData.displayDecimals,
-                    ticker
-                } as any;
+                    address: assetData.address,
+                    equals: (other: Token) => other.chainId===initializer.chainId && other.ticker===ticker && other.address===assetData.address,
+                    toString: () => `${initializer.chainId}-${ticker}`
+                };
+                this.smartChainTokens.push(token);
+                tokens[ticker] = addressMap[assetData.address] = token;
             }
 
             this.TokenResolver[initializer.chainId as keyof TypedTokenResolvers<T>] = {
@@ -280,7 +286,7 @@ export class SwapperFactory<T extends readonly ChainInitializer<any, ChainType,
             (btcRelay: BtcRelay<any, any, any>) => new MempoolBtcRelaySynchronizer(btcRelay, bitcoinRpc),
             chains as any,
             swapPricing,
-            pricingAssets,
+            this.smartChainTokens,
             options.messenger,
             options
         );

package/src/swaps/ISwap.ts

@@ -132,6 +132,14 @@ export abstract class ISwap<
      * @internal
      */
     _randomNonce: string;
+    /**
+     * Whether the swap is saved in the persistent storage or not.
+     *
+     * @remarks This field itself is not persisted but is instead derived during runtime
+     *
+     * @internal
+     */
+    _persisted: boolean = false;
 
 
     /**