@atomiqlabs/lp-lib 17.3.0 → 17.4.0

package/dist/index.d.ts

@@ -38,5 +38,6 @@ export * from "./wallets/ILightningWallet";
 export * from "./wallets/ISpvVaultSigner";
 export * from "./swaps/spv_vault_swap/SpvVaults";
 export * from "./swaps/spv_vault_swap/SpvVault";
+export * from "./swaps/spv_vault_swap/StickyAddress";
 export * from "./swaps/spv_vault_swap/SpvVaultSwap";
 export * from "./swaps/spv_vault_swap/SpvVaultSwapHandler";

package/dist/index.js

@@ -54,5 +54,6 @@ __exportStar(require("./wallets/ILightningWallet"), exports);
 __exportStar(require("./wallets/ISpvVaultSigner"), exports);
 __exportStar(require("./swaps/spv_vault_swap/SpvVaults"), exports);
 __exportStar(require("./swaps/spv_vault_swap/SpvVault"), exports);
+__exportStar(require("./swaps/spv_vault_swap/StickyAddress"), exports);
 __exportStar(require("./swaps/spv_vault_swap/SpvVaultSwap"), exports);
 __exportStar(require("./swaps/spv_vault_swap/SpvVaultSwapHandler"), exports);

package/dist/plugins/IPlugin.d.ts

@@ -59,8 +59,8 @@ export interface IPlugin {
     author: string;
     description: string;
     onEnable(chainsData: MultichainData, bitcoinRpc: BitcoinRpc<any>, bitcoinWallet: IBitcoinWallet, lightningWallet: ILightningWallet, swapPricing: ISwapPrice, tokens: {
-        [ticker: string]: {
-            [chainId: string]: {
+        [chainId: string]: {
+            [ticker: string]: {
                 address: string;
                 decimals: number;
             };

package/dist/plugins/PluginManager.d.ts

@@ -28,8 +28,8 @@ export declare class PluginManager {
     static registerPlugin(name: string, plugin: IPlugin): void;
     static unregisterPlugin(name: string): boolean;
     static enable<T extends SwapData>(chainsData: MultichainData, bitcoinRpc: BitcoinRpc<any>, bitcoinWallet: IBitcoinWallet, lightningWallet: ILightningWallet, swapPricing: ISwapPrice, tokens: {
-        [ticker: string]: {
-            [chainId: string]: {
+        [chainId: string]: {
+            [ticker: string]: {
                 address: string;
                 decimals: number;
             };

package/dist/swaps/assertions/FromBtcAmountAssertions.js

@@ -24,8 +24,8 @@ class FromBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
             if ((0, IPlugin_1.isQuoteSetFees)(res)) {
                 return {
-                    baseFee: res.baseFee || this.config.baseFee,
-                    feePPM: res.feePPM || this.config.feePPM,
+                    baseFee: res.baseFee ?? this.config.baseFee,
+                    feePPM: res.feePPM ?? this.config.feePPM,
                     securityDepositApyPPM: res.securityDepositApyPPM,
                     securityDepositBaseMultiplierPPM: res.securityDepositBaseMultiplierPPM
                 };

package/dist/swaps/assertions/ToBtcAmountAssertions.js

@@ -19,8 +19,8 @@ class ToBtcAmountAssertions extends AmountAssertions_1.AmountAssertions {
             AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(res);
             if ((0, IPlugin_1.isQuoteSetFees)(res)) {
                 return {
-                    baseFee: res.baseFee || this.config.baseFee,
-                    feePPM: res.feePPM || this.config.feePPM
+                    baseFee: res.baseFee ?? this.config.baseFee,
+                    feePPM: res.feePPM ?? this.config.feePPM
                 };
             }
         }

package/dist/swaps/spv_vault_swap/SpvVaultSwap.d.ts

@@ -38,6 +38,8 @@ export declare class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
     readonly token: string;
     readonly gasToken: string;
     btcTxId: string;
+    saveStickyAddress?: boolean;
+    hasStickyAddress?: boolean;
     constructor(chainIdentifier: string, quoteId: string, expiry: number, vault: SpvVault, vaultUtxo: string, btcAddress: string, btcFeeRate: number, recipient: string, amountBtc: bigint, amountToken: bigint, amountGasToken: bigint, swapFee: bigint, swapFeeInToken: bigint, gasSwapFee: bigint, gasSwapFeeInToken: bigint, callerFeeShare: bigint, frontingFeeShare: bigint, executionFeeShare: bigint, token: string, gasToken: string);
     constructor(data: any);
     serialize(): any;

package/dist/swaps/spv_vault_swap/SpvVaultSwap.js

@@ -75,6 +75,8 @@ class SpvVaultSwap extends SwapHandlerSwap_1.SwapHandlerSwap {
             this.tokenMultiplier = (0, Utils_1.deserializeBN)(chainIdentifierOrObj.tokenMultiplier);
             this.gasTokenMultiplier = (0, Utils_1.deserializeBN)(chainIdentifierOrObj.gasTokenMultiplier);
             this.btcTxId = chainIdentifierOrObj.btcTxId;
+            this.hasStickyAddress = chainIdentifierOrObj.hasStickyAddress;
+            this.saveStickyAddress = chainIdentifierOrObj.saveStickyAddress;
         }
         this.type = SwapHandler_1.SwapHandlerType.FROM_BTC_SPV;
     }
@@ -106,7 +108,9 @@ class SpvVaultSwap extends SwapHandlerSwap_1.SwapHandlerSwap {
             gasToken: this.gasToken,
             tokenMultiplier: (0, Utils_1.serializeBN)(this.tokenMultiplier),
             gasTokenMultiplier: (0, Utils_1.serializeBN)(this.gasTokenMultiplier),
-            btcTxId: this.btcTxId
+            btcTxId: this.btcTxId,
+            hasStickyAddress: this.hasStickyAddress,
+            saveStickyAddress: this.saveStickyAddress
         };
     }
     getIdentifierHash() {

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.d.ts

@@ -9,6 +9,7 @@ import { ISpvVaultSigner } from "../../wallets/ISpvVaultSigner";
 import { SpvVault } from "./SpvVault";
 import { FromBtcAmountAssertions } from "../assertions/FromBtcAmountAssertions";
 import { SpvVaults } from "./SpvVaults";
+import { StickyAddress } from "./StickyAddress";
 export type SpvVaultSwapHandlerConfig = SwapBaseConfig & {
     vaultsCheckInterval: number;
     gasTokenMax: {
@@ -40,7 +41,10 @@ export declare class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVa
     readonly AmountAssertions: FromBtcAmountAssertions;
     readonly Vaults: SpvVaults;
     config: SpvVaultSwapHandlerConfig;
-    constructor(storageDirectory: IIntermediaryStorage<SpvVaultSwap>, vaultStorage: IStorageManager<SpvVault>, path: string, chainsData: MultichainData, swapPricing: ISwapPrice, bitcoin: IBitcoinWallet, bitcoinRpc: BitcoinRpc<BtcBlock>, spvVaultSigner: ISpvVaultSigner, config: SpvVaultSwapHandlerConfig);
+    readonly stickyAddresses?: IStorageManager<StickyAddress>;
+    constructor(storageDirectory: IIntermediaryStorage<SpvVaultSwap>, vaultStorage: IStorageManager<SpvVault>, path: string, chainsData: MultichainData, swapPricing: ISwapPrice, bitcoin: IBitcoinWallet, bitcoinRpc: BitcoinRpc<BtcBlock>, spvVaultSigner: ISpvVaultSigner, config: SpvVaultSwapHandlerConfig, stickyAddresses?: IStorageManager<StickyAddress>);
+    private getStickyAddress;
+    addStickyAddress(chainId: string, address: string, btcAddress: string): Promise<void>;
     protected processClaimEvent(swap: SpvVaultSwap | null, event: SpvVaultClaimEvent): Promise<void>;
     /**
      * Chain event processor

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -15,9 +15,10 @@ const SpvVaults_1 = require("./SpvVaults");
 const BitcoinUtils_1 = require("../../utils/BitcoinUtils");
 const AmountAssertions_1 = require("../assertions/AmountAssertions");
 const IPlugin_1 = require("../../plugins/IPlugin");
+const StickyAddress_1 = require("./StickyAddress");
 const TX_MAX_VSIZE = 16 * 1024;
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
-    constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config) {
+    constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config, stickyAddresses) {
         super(storageDirectory, path, chainsData, swapPricing);
         this.type = SwapHandler_1.SwapHandlerType.FROM_BTC_SPV;
         this.inflightSwapStates = new Set([SpvVaultSwap_1.SpvVaultSwapState.SIGNED, SpvVaultSwap_1.SpvVaultSwapState.SENT, SpvVaultSwap_1.SpvVaultSwapState.BTC_CONFIRMED]);
@@ -28,6 +29,43 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
         this.config = config;
         this.AmountAssertions = new FromBtcAmountAssertions_1.FromBtcAmountAssertions(config, swapPricing);
         this.Vaults = new SpvVaults_1.SpvVaults(vaultStorage, bitcoin, spvVaultSigner, bitcoinRpc, this.chains, config);
+        this.stickyAddresses = stickyAddresses;
+    }
+    async getStickyAddress(chainId, address) {
+        if (this.stickyAddresses == null)
+            throw new Error("Sticky addresses are not supported!");
+        const { chainInterface } = this.getChain(chainId);
+        const normalizedAddress = chainInterface.normalizeAddress(address);
+        const addressIdentifier = chainId + "-" + normalizedAddress;
+        const result = this.stickyAddresses.data[addressIdentifier];
+        if (result == null)
+            return;
+        const btcAddress = result.address;
+        if (this.bitcoin.isOwnedAddress != null) {
+            if (!(await this.bitcoin.isOwnedAddress(btcAddress))) {
+                this.logger.warn(`getStickyAddress(): Failed to get sticky address, address ${btcAddress} is not controlled by our bitcoin wallet!`);
+                return;
+            }
+        }
+        return btcAddress;
+    }
+    async addStickyAddress(chainId, address, btcAddress) {
+        if (this.stickyAddresses == null)
+            throw new Error("Sticky addresses are not supported!");
+        const { chainInterface } = this.getChain(chainId);
+        const normalizedAddress = chainInterface.normalizeAddress(address);
+        if (this.bitcoin.isOwnedAddress != null) {
+            if (!(await this.bitcoin.isOwnedAddress(btcAddress))) {
+                this.logger.warn(`addStickyAddress(): Failed to create sticky address, address ${btcAddress} is not controlled by our bitcoin wallet!`);
+                return;
+            }
+        }
+        const addressIdentifier = chainId + "-" + normalizedAddress;
+        if (this.stickyAddresses.data[addressIdentifier] != null) {
+            this.logger.warn(`addStickyAddress(): Failed to create sticky address, address sticky address already exists for ${addressIdentifier}!`);
+            return;
+        }
+        await this.stickyAddresses.saveData(addressIdentifier, new StickyAddress_1.StickyAddress(btcAddress));
     }
     async processClaimEvent(swap, event) {
         if (swap == null)
@@ -35,6 +73,13 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
         //Update swap
         swap.txIds.claim = event.meta?.txId;
         await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.CLAIMED);
+        if (swap.saveStickyAddress)
+            try {
+                await this.addStickyAddress(swap.chainIdentifier, swap.recipient, swap.btcAddress);
+            }
+            catch (e) {
+                this.logger.error(`processClaimEvent(): Failed to create the sticky address for swap ${swap.getIdentifier()}`);
+            }
     }
     /**
      * Chain event processor
@@ -91,6 +136,10 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                 this.btcTxIdIndex.set(swap.btcTxId, swap);
         }
         await this.Vaults.init();
+        if (this.stickyAddresses != null) {
+            await this.stickyAddresses.init();
+            await this.stickyAddresses.loadData(StickyAddress_1.StickyAddress);
+        }
         this.subscribeToEvents();
         await PluginManager_1.PluginManager.serviceInitialize(this);
     }
@@ -98,7 +147,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
         if (swap.state === SpvVaultSwap_1.SpvVaultSwapState.CREATED) {
             if (swap.expiry < Date.now() / 1000) {
                 await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.EXPIRED);
-                await this.bitcoin.addUnusedAddress(swap.btcAddress);
+                if (!swap.hasStickyAddress)
+                    await this.bitcoin.addUnusedAddress(swap.btcAddress);
             }
         }
         if (swap.state === SpvVaultSwap_1.SpvVaultSwapState.SIGNED) {
@@ -182,10 +232,14 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const { signer, chainInterface, spvVaultContract } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**
+             * address: string              smart chain address of the recipient
              * token: string                Desired token to use
              * gasToken: string
              */
             const preFetchParsedBody = await req.paramReader.getParams({
+                address: (val) => val != null &&
+                    typeof (val) === "string" &&
+                    chainInterface.isValidAddress(val, true) ? val : null,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
@@ -198,6 +252,10 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     code: 20100,
                     msg: "Invalid request body"
                 };
+            const stickyAddressObject = req.paramReader.getExistingParamsOrNull({
+                stickyAddress: SchemaVerifier_1.FieldTypeEnum.BooleanOptional
+            });
+            const useStickyAddress = stickyAddressObject?.stickyAddress;
             //Create abortController for parallel prefetches
             const responseStream = res.responseStream;
             const abortController = (0, Utils_1.getAbortController)(responseStream);
@@ -210,7 +268,13 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             });
             //Listener that re-adds the returned bitcoin address to the unused address list if request fails or closes
             let abortAddUnusedAddressListener;
-            const bitcoinAddressPrefetch = this.bitcoin.getAddress().then(value => {
+            const bitcoinAddressPrefetch = (async () => {
+                if (useStickyAddress) {
+                    const result = await this.getStickyAddress(chainIdentifier, preFetchParsedBody.address);
+                    if (result != null)
+                        return { address: result, isStickyAddress: true };
+                }
+                const value = await this.bitcoin.getAddress();
                 //Already aborted
                 if (abortController.signal.aborted) {
                     this.bitcoin.addUnusedAddress(value);
@@ -220,13 +284,12 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                 abortController.signal.addEventListener("abort", abortAddUnusedAddressListener = () => {
                     this.bitcoin.addUnusedAddress(value);
                 });
-                return value;
-            }).catch(e => {
+                return { address: value, isStickyAddress: false };
+            })().catch(e => {
                 abortController.abort(e);
                 return null;
             });
             /**
-             * address: string              smart chain address of the recipient
              * amount: string               amount (in sats)
              * gasAmount: string            Desired amount in gas token to also get
              * exactOut: boolean            Whether the swap should be an exact out instead of exact in swap
@@ -234,9 +297,6 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
              * frontingFeeRate: string      Fronting fee (in output token) to assign to the swap
              */
             const actualParsedBody = await req.paramReader.getParams({
-                address: (val) => val != null &&
-                    typeof (val) === "string" &&
-                    chainInterface.isValidAddress(val, true) ? val : null,
                 amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
                 gasAmount: SchemaVerifier_1.FieldTypeEnum.BigInt,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional,
@@ -304,9 +364,11 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             metadata.times.vaultPicked = Date.now();
             //Create swap receive bitcoin address
             const btcFeeRate = await btcFeeRatePrefetch;
-            const receiveAddress = await bitcoinAddressPrefetch;
+            const btcAddressObject = await bitcoinAddressPrefetch;
             abortController.signal.throwIfAborted();
             metadata.times.addressCreated = Date.now();
+            const receiveAddress = btcAddressObject.address;
+            const hasStickyAddress = btcAddressObject.isStickyAddress;
             //Adjust the amounts based on passed fees
             if (parsedBody.exactOut) {
                 totalInToken = parsedBody.amount;
@@ -327,6 +389,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const quoteId = (0, crypto_1.randomBytes)(32).toString("hex");
             const swap = new SpvVaultSwap_1.SpvVaultSwap(chainIdentifier, quoteId, expiry, vault, utxo, receiveAddress, btcFeeRate, parsedBody.address, totalBtcOutput, totalInToken, totalInGasToken, swapFee, swapFeeInToken, gasSwapFee, gasSwapFeeInToken, callerFeeShare, frontingFeeShare, executionFeeShare, useToken, gasToken);
             swap.metadata = metadata;
+            swap.saveStickyAddress = useStickyAddress && !hasStickyAddress;
+            swap.hasStickyAddress = hasStickyAddress;
             //We can remove the listener to add unused address now, as we are about to save the swap
             abortController.signal.removeEventListener("abort", abortAddUnusedAddressListener);
             await PluginManager_1.PluginManager.swapCreate(swap);

package/dist/swaps/spv_vault_swap/StickyAddress.d.ts

@@ -0,0 +1,6 @@
+import { StorageObject } from "@atomiqlabs/base";
+export declare class StickyAddress implements StorageObject {
+    address: string;
+    constructor(addressOrSerialized: string | any);
+    serialize(): any;
+}

package/dist/swaps/spv_vault_swap/StickyAddress.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StickyAddress = void 0;
+class StickyAddress {
+    constructor(addressOrSerialized) {
+        if (typeof (addressOrSerialized) === "string") {
+            this.address = addressOrSerialized;
+        }
+        else {
+            this.address = addressOrSerialized.address;
+        }
+    }
+    serialize() {
+        return {
+            address: this.address
+        };
+    }
+}
+exports.StickyAddress = StickyAddress;

package/dist/wallets/IBitcoinWallet.d.ts

@@ -63,6 +63,11 @@ export declare abstract class IBitcoinWallet {
      * Returns an unused address suitable for receiving
      */
     abstract getAddress(): Promise<string>;
+    /**
+     * Whether a provided address is controlled by this wallet
+     * @param address
+     */
+    isOwnedAddress?(address: string): Promise<boolean>;
     /**
      * Adds previously returned address (with getAddress call), to the pool of unused addresses
      * @param address

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "17.3.0",
+  "version": "17.4.0",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/index.ts

@@ -49,5 +49,6 @@ export * from "./wallets/ISpvVaultSigner";
 
 export * from "./swaps/spv_vault_swap/SpvVaults";
 export * from "./swaps/spv_vault_swap/SpvVault";
+export * from "./swaps/spv_vault_swap/StickyAddress";
 export * from "./swaps/spv_vault_swap/SpvVaultSwap";
 export * from "./swaps/spv_vault_swap/SpvVaultSwapHandler";

package/src/plugins/IPlugin.ts

@@ -96,8 +96,8 @@ export interface IPlugin {
 
         swapPricing: ISwapPrice,
         tokens: {
-            [ticker: string]: {
-                [chainId: string]: {
+            [chainId: string]: {
+                [ticker: string]: {
                     address: string,
                     decimals: number
                 }

package/src/plugins/PluginManager.ts

@@ -74,8 +74,8 @@ export class PluginManager {
 
         swapPricing: ISwapPrice,
         tokens: {
-            [ticker: string]: {
-                [chainId: string]: {
+            [chainId: string]: {
+                [ticker: string]: {
                     address: string,
                     decimals: number
                 }

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -55,8 +55,8 @@ export class FromBtcAmountAssertions extends AmountAssertions {
             AmountAssertions.handlePluginErrorResponses(res);
             if(isQuoteSetFees(res)) {
                 return {
-                    baseFee: res.baseFee || this.config.baseFee,
-                    feePPM: res.feePPM || this.config.feePPM,
+                    baseFee: res.baseFee ?? this.config.baseFee,
+                    feePPM: res.feePPM ?? this.config.feePPM,
                     securityDepositApyPPM: res.securityDepositApyPPM,
                     securityDepositBaseMultiplierPPM: res.securityDepositBaseMultiplierPPM
                 }

package/src/swaps/assertions/ToBtcAmountAssertions.ts

@@ -33,8 +33,8 @@ export class ToBtcAmountAssertions extends AmountAssertions {
             AmountAssertions.handlePluginErrorResponses(res);
             if(isQuoteSetFees(res)) {
                 return {
-                    baseFee: res.baseFee || this.config.baseFee,
-                    feePPM: res.feePPM || this.config.feePPM
+                    baseFee: res.baseFee ?? this.config.baseFee,
+                    feePPM: res.feePPM ?? this.config.feePPM
                 }
             }
         }

package/src/swaps/spv_vault_swap/SpvVaultSwap.ts

@@ -53,6 +53,9 @@ export class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
 
     btcTxId: string;
 
+    saveStickyAddress?: boolean;
+    hasStickyAddress?: boolean;
+
     constructor(
         chainIdentifier: string, quoteId: string, expiry: number,
         vault: SpvVault, vaultUtxo: string,
@@ -129,6 +132,8 @@ export class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
             this.tokenMultiplier = deserializeBN(chainIdentifierOrObj.tokenMultiplier);
             this.gasTokenMultiplier = deserializeBN(chainIdentifierOrObj.gasTokenMultiplier);
             this.btcTxId = chainIdentifierOrObj.btcTxId;
+            this.hasStickyAddress = chainIdentifierOrObj.hasStickyAddress;
+            this.saveStickyAddress = chainIdentifierOrObj.saveStickyAddress;
         }
         this.type = SwapHandlerType.FROM_BTC_SPV;
     }
@@ -161,7 +166,9 @@ export class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
             gasToken: this.gasToken,
             tokenMultiplier: serializeBN(this.tokenMultiplier),
             gasTokenMultiplier: serializeBN(this.gasTokenMultiplier),
-            btcTxId: this.btcTxId
+            btcTxId: this.btcTxId,
+            hasStickyAddress: this.hasStickyAddress,
+            saveStickyAddress: this.saveStickyAddress
         };
     }
 

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -38,6 +38,7 @@ import {SpvVaults, VAULT_DUST_AMOUNT} from "./SpvVaults";
 import {isLegacyInput} from "../../utils/BitcoinUtils";
 import {AmountAssertions} from "../assertions/AmountAssertions";
 import {isQuoteThrow} from "../../plugins/IPlugin";
+import {StickyAddress} from "./StickyAddress";
 
 export type SpvVaultSwapHandlerConfig = SwapBaseConfig & {
     vaultsCheckInterval: number,
@@ -78,6 +79,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
 
     config: SpvVaultSwapHandlerConfig;
 
+    readonly stickyAddresses?: IStorageManager<StickyAddress>;
+
     constructor(
         storageDirectory: IIntermediaryStorage<SpvVaultSwap>,
         vaultStorage: IStorageManager<SpvVault>,
@@ -87,7 +90,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
         bitcoin: IBitcoinWallet,
         bitcoinRpc: BitcoinRpc<BtcBlock>,
         spvVaultSigner: ISpvVaultSigner,
-        config: SpvVaultSwapHandlerConfig
+        config: SpvVaultSwapHandlerConfig,
+        stickyAddresses?: IStorageManager<StickyAddress>
     ) {
         super(storageDirectory, path, chainsData, swapPricing);
         this.bitcoinRpc = bitcoinRpc;
@@ -96,6 +100,52 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
         this.config = config;
         this.AmountAssertions = new FromBtcAmountAssertions(config, swapPricing);
         this.Vaults = new SpvVaults(vaultStorage, bitcoin, spvVaultSigner, bitcoinRpc, this.chains, config);
+        this.stickyAddresses = stickyAddresses;
+    }
+
+    private async getStickyAddress(chainId: string, address: string): Promise<string | undefined> {
+        if(this.stickyAddresses==null) throw new Error("Sticky addresses are not supported!");
+
+        const {chainInterface} = this.getChain(chainId);
+        const normalizedAddress = chainInterface.normalizeAddress(address);
+
+        const addressIdentifier = chainId+"-"+normalizedAddress;
+
+        const result = this.stickyAddresses.data[addressIdentifier];
+        if(result==null) return;
+
+        const btcAddress = result.address;
+
+        if(this.bitcoin.isOwnedAddress!=null) {
+            if(!(await this.bitcoin.isOwnedAddress(btcAddress))) {
+                this.logger.warn(`getStickyAddress(): Failed to get sticky address, address ${btcAddress} is not controlled by our bitcoin wallet!`);
+                return;
+            }
+        }
+
+        return btcAddress;
+    }
+
+    async addStickyAddress(chainId: string, address: string, btcAddress: string) {
+        if(this.stickyAddresses==null) throw new Error("Sticky addresses are not supported!");
+
+        const {chainInterface} = this.getChain(chainId);
+        const normalizedAddress = chainInterface.normalizeAddress(address);
+
+        if(this.bitcoin.isOwnedAddress!=null) {
+            if(!(await this.bitcoin.isOwnedAddress(btcAddress))) {
+                this.logger.warn(`addStickyAddress(): Failed to create sticky address, address ${btcAddress} is not controlled by our bitcoin wallet!`);
+                return;
+            }
+        }
+
+        const addressIdentifier = chainId+"-"+normalizedAddress;
+
+        if(this.stickyAddresses.data[addressIdentifier]!=null) {
+            this.logger.warn(`addStickyAddress(): Failed to create sticky address, address sticky address already exists for ${addressIdentifier}!`);
+            return;
+        }
+        await this.stickyAddresses.saveData(addressIdentifier, new StickyAddress(btcAddress));
     }
 
     protected async processClaimEvent(swap: SpvVaultSwap | null, event: SpvVaultClaimEvent): Promise<void> {
@@ -103,6 +153,11 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
         //Update swap
         swap.txIds.claim = event.meta?.txId;
         await this.removeSwapData(swap, SpvVaultSwapState.CLAIMED);
+        if(swap.saveStickyAddress) try {
+            await this.addStickyAddress(swap.chainIdentifier, swap.recipient, swap.btcAddress);
+        } catch (e) {
+            this.logger.error(`processClaimEvent(): Failed to create the sticky address for swap ${swap.getIdentifier()}`);
+        }
     }
 
     /**
@@ -161,6 +216,10 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             if(swap.btcTxId!=null) this.btcTxIdIndex.set(swap.btcTxId, swap);
         }
         await this.Vaults.init();
+        if(this.stickyAddresses!=null) {
+            await this.stickyAddresses.init();
+            await this.stickyAddresses.loadData(StickyAddress);
+        }
         this.subscribeToEvents();
         await PluginManager.serviceInitialize(this);
     }
@@ -169,7 +228,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
         if(swap.state===SpvVaultSwapState.CREATED) {
             if(swap.expiry < Date.now()/1000) {
                 await this.removeSwapData(swap, SpvVaultSwapState.EXPIRED);
-                await this.bitcoin.addUnusedAddress(swap.btcAddress);
+                if(!swap.hasStickyAddress) await this.bitcoin.addUnusedAddress(swap.btcAddress);
             }
         }
 
@@ -260,10 +319,14 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             metadata.times.requestReceived = Date.now();
 
             /**
+             * address: string              smart chain address of the recipient
              * token: string                Desired token to use
              * gasToken: string
              */
             const preFetchParsedBody = await req.paramReader.getParams({
+                address: (val: string) => val!=null &&
+                    typeof(val)==="string" &&
+                    chainInterface.isValidAddress(val, true) ? val : null,
                 token: (val: string) => val!=null &&
                     typeof(val)==="string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
@@ -276,6 +339,11 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 msg: "Invalid request body"
             };
 
+            const stickyAddressObject = req.paramReader.getExistingParamsOrNull({
+                stickyAddress: FieldTypeEnum.BooleanOptional
+            });
+            const useStickyAddress = stickyAddressObject?.stickyAddress;
+
             //Create abortController for parallel prefetches
             const responseStream = res.responseStream;
             const abortController = getAbortController(responseStream);
@@ -293,7 +361,15 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
 
             //Listener that re-adds the returned bitcoin address to the unused address list if request fails or closes
             let abortAddUnusedAddressListener: () => void;
-            const bitcoinAddressPrefetch = this.bitcoin.getAddress().then(value => {
+
+            const bitcoinAddressPrefetch: Promise<{address: string, isStickyAddress: boolean} | null> = (async () => {
+                if(useStickyAddress) {
+                    const result = await this.getStickyAddress(chainIdentifier, preFetchParsedBody.address);
+                    if(result!=null) return {address: result, isStickyAddress: true};
+                }
+
+                const value = await this.bitcoin.getAddress();
+
                 //Already aborted
                 if(abortController.signal.aborted) {
                     this.bitcoin.addUnusedAddress(value);
@@ -303,14 +379,13 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 abortController.signal.addEventListener("abort", abortAddUnusedAddressListener = () => {
                     this.bitcoin.addUnusedAddress(value);
                 });
-                return value;
-            }).catch(e => {
+                return {address: value, isStickyAddress: false};
+            })().catch(e => {
                 abortController.abort(e);
                 return null;
             });
 
             /**
-             * address: string              smart chain address of the recipient
              * amount: string               amount (in sats)
              * gasAmount: string            Desired amount in gas token to also get
              * exactOut: boolean            Whether the swap should be an exact out instead of exact in swap
@@ -318,9 +393,6 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
              * frontingFeeRate: string      Fronting fee (in output token) to assign to the swap
              */
             const actualParsedBody = await req.paramReader.getParams({
-                address: (val: string) => val!=null &&
-                    typeof(val)==="string" &&
-                    chainInterface.isValidAddress(val, true) ? val : null,
                 amount: FieldTypeEnum.BigInt,
                 gasAmount: FieldTypeEnum.BigInt,
                 exactOut: FieldTypeEnum.BooleanOptional,
@@ -411,10 +483,13 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
 
             //Create swap receive bitcoin address
             const btcFeeRate = await btcFeeRatePrefetch;
-            const receiveAddress = await bitcoinAddressPrefetch;
+            const btcAddressObject = await bitcoinAddressPrefetch;
             abortController.signal.throwIfAborted();
             metadata.times.addressCreated = Date.now();
 
+            const receiveAddress = btcAddressObject.address;
+            const hasStickyAddress = btcAddressObject.isStickyAddress;
+
             //Adjust the amounts based on passed fees
             if(parsedBody.exactOut) {
                 totalInToken = parsedBody.amount;
@@ -445,6 +520,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 useToken, gasToken
             );
             swap.metadata = metadata;
+            swap.saveStickyAddress = useStickyAddress && !hasStickyAddress
+            swap.hasStickyAddress = hasStickyAddress;
 
             //We can remove the listener to add unused address now, as we are about to save the swap
             abortController.signal.removeEventListener("abort", abortAddUnusedAddressListener);

package/src/swaps/spv_vault_swap/StickyAddress.ts

@@ -0,0 +1,21 @@
+import {StorageObject} from "@atomiqlabs/base";
+
+export class StickyAddress implements StorageObject {
+
+    address: string;
+
+    constructor(addressOrSerialized: string | any) {
+        if(typeof(addressOrSerialized) === "string") {
+            this.address = addressOrSerialized;
+        } else {
+            this.address = addressOrSerialized.address;
+        }
+    }
+
+    serialize(): any {
+        return {
+            address: this.address
+        }
+    }
+
+}

package/src/wallets/IBitcoinWallet.ts

@@ -154,6 +154,11 @@ export abstract class IBitcoinWallet {
      * Returns an unused address suitable for receiving
      */
     abstract getAddress(): Promise<string>;
+    /**
+     * Whether a provided address is controlled by this wallet
+     * @param address
+     */
+    isOwnedAddress?(address: string): Promise<boolean>;
     /**
      * Adds previously returned address (with getAddress call), to the pool of unused addresses
      * @param address