@atomiqlabs/sdk 8.4.4 → 8.6.0

package/src/swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper.ts

@@ -25,11 +25,17 @@ import {UnifiedSwapStorage} from "../../../../storage/UnifiedSwapStorage";
 import {ISwap} from "../../../ISwap";
 import {AmountData} from "../../../../types/AmountData";
 import {tryWithRetries} from "../../../../utils/RetryUtils";
-import {AllOptional, AllRequired} from "../../../../utils/TypeUtils";
+import {AllOptional} from "../../../../utils/TypeUtils";
 import {ToBTCSwapState} from "../IToBTCSwap";
 
 export type ToBTCOptions = {
+    /**
+     * @deprecated Ignored by the LP anyway
+     */
     confirmationTarget?: number,
+    /**
+     * @deprecated Default 2 confirmations should be enough for any currently supported amount by atomiq
+     */
     confirmations?: number
 }
 
@@ -154,7 +160,10 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
         resp: ToBTCResponseType,
         amountData: AmountData,
         lp: Intermediary,
-        options: AllRequired<ToBTCOptions>,
+        options: {
+            confirmations: number,
+            confirmationTarget: number
+        },
         data: T["Data"],
         hash: string
     ): void {
@@ -220,7 +229,7 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
         intermediary: Intermediary
     }[] {
         if(!this.isInitialized) throw new Error("Not initialized, call init() first!");
-        const _options: AllRequired<ToBTCOptions> = {
+        const _options = {
             confirmationTarget: options?.confirmationTarget ?? 3,
             confirmations: options?.confirmations ?? 2
         };

package/src/swaps/spv_swaps/SpvFromBTCSwap.ts

@@ -193,6 +193,8 @@ export class SpvFromBTCSwap<T extends ChainType>
     extends ISwap<T, SpvFromBTCTypeDefinition<T>>
     implements IBTCWalletSwap, ISwapWithGasDrop<T>, IClaimableSwap<T, SpvFromBTCTypeDefinition<T>, SpvFromBTCSwapState> {
 
+    protected readonly currentVersion: number = 2;
+
     readonly TYPE: SwapType.SPV_VAULT_FROM_BTC = SwapType.SPV_VAULT_FROM_BTC;
 
     /**
@@ -240,6 +242,8 @@ export class SpvFromBTCSwap<T extends ChainType>
 
     private readonly gasPricingInfo?: PriceInfoType;
 
+    private posted?: boolean;
+
     /**
      * @internal
      */
@@ -337,6 +341,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             this._frontTxId = initOrObject.frontTxId;
             this.gasPricingInfo = deserializePriceInfoType(initOrObject.gasPricingInfo);
             this.btcTxConfirmedAt = initOrObject.btcTxConfirmedAt;
+            this.posted = initOrObject.posted;
             if(initOrObject.data!=null) this._data = new this.wrapper._spvWithdrawalDataDeserializer(initOrObject.data);
         }
         this.tryCalculateSwapFee();
@@ -347,7 +352,12 @@ export class SpvFromBTCSwap<T extends ChainType>
      * @inheritDoc
      * @internal
      */
-    protected upgradeVersion() { /*NOOP*/ }
+    protected upgradeVersion() {
+        if(this.version===1) {
+            this.posted = this.initiated;
+            this.version = 2;
+        }
+    }
 
     /**
      * @inheritDoc
@@ -582,7 +592,7 @@ export class SpvFromBTCSwap<T extends ChainType>
      *
      * @internal
      */
-    protected getOutputWithoutFee(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    protected getOutputWithoutFee(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             (this.outputTotalSwap * (100_000n + this.callerFeeShare + this.frontingFeeShare + this.executionFeeShare) / 100_000n) + (this.swapFee ?? 0n),
             this.wrapper._tokens[this.outputSwapToken], this.wrapper._prices, this.pricingInfo
@@ -704,21 +714,21 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(this.outputTotalSwap, this.wrapper._tokens[this.outputSwapToken], this.wrapper._prices, this.pricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getGasDropOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getGasDropOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(this.outputTotalGas, this.wrapper._tokens[this.outputGasToken], this.wrapper._prices, this.gasPricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.getInputAmountWithoutFee(), BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
@@ -732,7 +742,7 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInput(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.btcAmount, BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
@@ -973,6 +983,7 @@ export class SpvFromBTCSwap<T extends ChainType>
 
         this._data = data;
         this.initiated = true;
+        this.posted = true;
         await this._saveAndEmit(SpvFromBTCSwapState.SIGNED);
 
         try {
@@ -996,7 +1007,7 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>, true> | null> {
+    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<BtcToken<false>, true> | null> {
         const bitcoinWallet: IBitcoinWallet = toBitcoinWallet(_bitcoinWallet, this.wrapper._btcRpc, this.wrapper._options.bitcoinNetwork);
         const txFee = await bitcoinWallet.getFundedPsbtFee((await this.getPsbt()).psbt, feeRate);
         if(txFee==null) return null;
@@ -1186,7 +1197,7 @@ export class SpvFromBTCSwap<T extends ChainType>
         if(
             this._state!==SpvFromBTCSwapState.POSTED &&
             this._state!==SpvFromBTCSwapState.BROADCASTED &&
-            !(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && this.initiated)
+            !(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && this.posted)
         ) throw new Error("Must be in POSTED or BROADCASTED state!");
         if(this._data==null) throw new Error("Expected swap to have withdrawal data filled!");
 
@@ -1529,6 +1540,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             executionFeeShare: this.executionFeeShare.toString(10),
             genesisSmartChainBlockHeight: this._genesisSmartChainBlockHeight,
             gasPricingInfo: serializePriceInfoType(this.gasPricingInfo),
+            posted: this.posted,
 
             senderAddress: this._senderAddress,
             claimTxId: this._claimTxId,
@@ -1704,7 +1716,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             }
         }
 
-        if(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && !this.initiated) {
+        if(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && !this.posted) {
             if(this.expiry<Date.now()) {
                 this._state = SpvFromBTCSwapState.QUOTE_EXPIRED;
                 if(save) await this._saveAndEmit();

package/src/swaps/spv_swaps/SpvFromBTCWrapper.ts

@@ -32,13 +32,47 @@ import {ISwap} from "../ISwap";
 import {IClaimableSwapWrapper} from "../IClaimableSwapWrapper";
 import {AmountData} from "../../types/AmountData";
 import {tryWithRetries} from "../../utils/RetryUtils";
-import {AllOptional, AllRequired} from "../../utils/TypeUtils";
+import {AllOptional} from "../../utils/TypeUtils";
+import {fromHumanReadableString} from "../../utils/TokenUtils";
+import {UserError} from "../../errors/UserError";
 
 export type SpvFromBTCOptions = {
-    gasAmount?: bigint,
+    /**
+     * Optional additional native token to receive as an output of the swap (e.g. STRK on Starknet or cBTC on Citrea).
+     *
+     * When passed as a `bigint` it is specified in base units of the token and in `string` it is the human readable
+     *  decimal format.
+     */
+    gasAmount?: bigint | string,
+    /**
+     * The LP enforces a minimum bitcoin fee rate in sats/vB for the swap transaction. With this config you can optionally
+     *  limit how high of a minimum fee rate would you accept.
+     *
+     * By default the maximum allowed fee rate is calculated dynamically based on current bitcoin fee rate as:
+     *
+     * `maxAllowedBitcoinFeeRate` = 10 + `currentBitcoinFeeRate` * 1.5
+     */
+    maxAllowedBitcoinFeeRate?: number,
+    /**
+     * A flag to attach 0 watchtower fee to the swap, this would make the settlement unattractive for the watchtowers
+     *  and therefore automatic settlement for such swaps will not be possible, you will have to settle manually
+     *  with {@link FromBTCLNSwap.claim} or {@link FromBTCLNSwap.txsClaim} functions.
+     */
     unsafeZeroWatchtowerFee?: boolean,
+    /**
+     * A safety factor to use when estimating the watchtower fee to attach to the swap (this has to cover the gas fee
+     *  of watchtowers settling the swap). A higher multiple here would mean that a swap is more attractive for
+     *  watchtowers to settle automatically.
+     *
+     * Uses a `1.25` multiple by default (i.e. the current network fee is multiplied by 1.25 and then used to estimate
+     *  the settlement gas fee cost)
+     */
     feeSafetyFactor?: number,
-    maxAllowedNetworkFeeRate?: number
+
+    /**
+     * @deprecated Use `maxAllowedBitcoinFeeRate` instead!
+     */
+    maxAllowedNetworkFeeRate?: number,
 };
 
 export type SpvFromBTCWrapperOptions = ISwapWrapperOptions & {
@@ -275,7 +309,10 @@ export class SpvFromBTCWrapper<
      */
     private async preFetchCallerFeeShare(
         amountData: AmountData,
-        options: AllRequired<SpvFromBTCOptions>,
+        options: {
+            unsafeZeroWatchtowerFee: boolean,
+            feeSafetyFactor: number
+        },
         pricePrefetch: Promise<bigint | undefined>,
         nativeTokenPricePrefetch: Promise<bigint | undefined> | undefined,
         abortController: AbortController
@@ -355,7 +392,9 @@ export class SpvFromBTCWrapper<
         resp: SpvFromBTCPrepareResponseType,
         amountData: AmountData,
         lp: Intermediary,
-        options: SpvFromBTCOptions,
+        options: {
+            gasAmount: bigint
+        },
         callerFeeShare: bigint,
         bitcoinFeeRatePromise: Promise<number | undefined>,
         abortSignal: AbortSignal
@@ -438,7 +477,7 @@ export class SpvFromBTCWrapper<
                         throw new IntermediaryError("Invalid amount0 multiplier used, rawAmount diff too high");
                     if(resp.total !== adjustedAmount) throw new IntermediaryError("Invalid total returned");
                 }
-                if(options.gasAmount==null || options.gasAmount===0n) {
+                if(options.gasAmount===0n) {
                     if(resp.totalGas !== 0n) throw new IntermediaryError("Invalid gas total returned");
                 } else {
                     //Check the difference between amount adjusted due to scaling to raw amount
@@ -548,13 +587,16 @@ export class SpvFromBTCWrapper<
         quote: Promise<SpvFromBTCSwap<T>>,
         intermediary: Intermediary
     }[] {
-        const _options: AllRequired<SpvFromBTCOptions> = {
-            gasAmount: options?.gasAmount ?? 0n,
+        const _options = {
+            gasAmount: this.parseGasAmount(options?.gasAmount),
             unsafeZeroWatchtowerFee: options?.unsafeZeroWatchtowerFee ?? false,
             feeSafetyFactor: options?.feeSafetyFactor ?? 1.25,
-            maxAllowedNetworkFeeRate: options?.maxAllowedNetworkFeeRate ?? Infinity
+            maxAllowedBitcoinFeeRate: options?.maxAllowedBitcoinFeeRate ?? options?.maxAllowedNetworkFeeRate ?? Infinity
         };
 
+        if(amountData.token===this._chain.getNativeCurrencyAddress() && _options.gasAmount!==0n)
+            throw new UserError("Cannot specify `gasAmount` for swaps to a native token!");
+
         const _abortController = extendAbortController(abortSignal);
         const pricePrefetchPromise: Promise<bigint | undefined> = this.preFetchPrice(amountData, _abortController.signal);
         const usdPricePrefetchPromise: Promise<number | undefined> = this.preFetchUsdPrice(_abortController.signal);
@@ -564,8 +606,8 @@ export class SpvFromBTCWrapper<
             undefined :
             this.preFetchPrice({token: nativeTokenAddress}, _abortController.signal);
         const callerFeePrefetchPromise = this.preFetchCallerFeeShare(amountData, _options, pricePrefetchPromise, gasTokenPricePrefetchPromise, _abortController);
-        const bitcoinFeeRatePromise: Promise<number | undefined> = _options.maxAllowedNetworkFeeRate!=Infinity ?
-            Promise.resolve(_options.maxAllowedNetworkFeeRate) :
+        const bitcoinFeeRatePromise: Promise<number | undefined> = _options.maxAllowedBitcoinFeeRate!=Infinity ?
+            Promise.resolve(_options.maxAllowedBitcoinFeeRate) :
             this._btcRpc.getFeeRate().then(x => this._options.maxBtcFeeOffset + (x*this._options.maxBtcFeeMultiplier)).catch(e => {
                 _abortController.abort(e);
                 return undefined;

package/src/swaps/trusted/ln/LnForGasSwap.ts

@@ -318,7 +318,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             this.outputAmount, this.wrapper._tokens[this.wrapper._chain.getNativeCurrencyAddress()],
             this.wrapper._prices, this.pricingInfo
@@ -335,7 +335,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<true>, true> {
+    getInput(): TokenAmount<BtcToken<true>, true> {
         const parsed = bolt11Decode(this.pr);
         const msats = parsed.millisatoshis;
         if(msats==null) throw new Error("Swap lightning invoice has no msat amount field!");
@@ -346,7 +346,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<true>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<true>, true> {
         const parsed = bolt11Decode(this.pr);
         const msats = parsed.millisatoshis;
         if(msats==null) throw new Error("Swap lightning invoice has no msat amount field!");

package/src/swaps/trusted/onchain/OnchainForGasSwap.ts

@@ -362,7 +362,7 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             this.outputAmount, this.wrapper._tokens[this.wrapper._chain.getNativeCurrencyAddress()],
             this.wrapper._prices, this.pricingInfo
@@ -379,14 +379,14 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInput(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.inputAmount, BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(
             this.inputAmount - (this.swapFeeBtc ?? 0n), BitcoinTokens.BTC,
             this.wrapper._prices, this.pricingInfo
@@ -526,7 +526,7 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>, true> | null> {
+    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<BtcToken<false>, true> | null> {
         const bitcoinWallet: IBitcoinWallet = toBitcoinWallet(_bitcoinWallet, this.wrapper._btcRpc, this.wrapper._options.bitcoinNetwork);
         const txFee = await bitcoinWallet.getTransactionFee(this.address, this.inputAmount, feeRate);
         if(txFee==null) return null;

package/src/types/Token.ts

@@ -1,15 +1,89 @@
+/**
+ * Type for all token types (BTC or smart chain)
+ *
+ * @category Tokens
+ */
+export type Token<ChainIdentifier extends string = string> = {
+    /**
+     * Chain identifier for the token's chain
+     */
+    chainId: ChainIdentifier | "BITCOIN" | "LIGHTNING",
+
+    /**
+     * Ticker of the token
+     */
+    ticker: string,
+    /**
+     * Full name of the token
+     */
+    name: string,
+    /**
+     * Actual decimal places of the tokens
+     */
+    decimals: number,
+    /**
+     * The decimal places that should be rendered and displayed to the user
+     */
+    displayDecimals?: number,
+
+    /**
+     * Address of the token contract, or `""` for Bitcoin
+     */
+    address: string,
+
+    // legacy compatibility
+    /**
+     * Legacy chain identifier distinguishing between Smart Chain and Bitcoin tokens
+     */
+    chain: "SC" | "BTC",
+    /**
+     * Legacy lightning flag, determines whether a Bitcoin token is an Lightning or on-chain one
+     */
+    lightning?: boolean,
+
+    // helpers
+    /**
+     * Equality check between tokens
+     */
+    equals: (other: Token) => boolean,
+    /**
+     * Returns the
+     */
+    toString: () => string
+};
+
+/**
+ * Type guard for a {@link Token} type, encompassing all tokens (BTC or smart chain)
+ *
+ * @category Tokens
+ */
+export function isToken(obj: any): obj is Token {
+    return typeof (obj) === "object" &&
+      (obj.chain === "SC" || obj.chain === "BTC") &&
+      typeof (obj.ticker) === "string" &&
+      typeof (obj.decimals) === "number" &&
+      typeof (obj.name) === "string";
+}
+
 /**
  * Bitcoin token type (BTC on on-chain or lightning)
  *
  * @category Tokens
  */
-export type BtcToken<L = boolean> = {
-    chain: "BTC",
-    lightning: L,
+export type BtcToken<L = boolean> = Token & {
+    chainId: L extends true ? "LIGHTNING" : "BITCOIN",
     ticker: "BTC",
-    decimals: 8,
     name: L extends true ? "Bitcoin (lightning L2)" : "Bitcoin (on-chain L1)",
-    displayDecimals?: number
+    decimals: 8,
+    displayDecimals: 8,
+
+    address: "",
+
+    // legacy compatibility
+    chain: "BTC",
+    lightning: L,
+
+    toString: () => L extends true ? "BTC-LN" : "BTC"
 };
 
 /**
@@ -37,17 +111,27 @@ export const BitcoinTokens: {
 } = {
     BTC: {
         chain: "BTC",
+        chainId: "BITCOIN",
         lightning: false,
         ticker: "BTC",
         decimals: 8,
-        name: "Bitcoin (on-chain L1)"
+        displayDecimals: 8,
+        name: "Bitcoin (on-chain L1)",
+        address: "",
+        equals: (other: Token) => other.chainId==="BITCOIN" && other.ticker==="BTC",
+        toString: () => "BTC"
     },
     BTCLN: {
         chain: "BTC",
+        chainId: "LIGHTNING",
         lightning: true,
         ticker: "BTC",
         decimals: 8,
-        name: "Bitcoin (lightning L2)"
+        displayDecimals: 8,
+        name: "Bitcoin (lightning L2)",
+        address: "",
+        equals: (other: Token) => other.chainId==="LIGHTNING" && other.ticker==="BTC",
+        toString: () => "BTC-LN"
     }
 };
 
@@ -56,42 +140,24 @@ export const BitcoinTokens: {
  *
  * @category Tokens
  */
-export type SCToken<ChainIdentifier extends string = string> = {
-    chain: "SC",
+export type SCToken<ChainIdentifier extends string = string> = Token<ChainIdentifier> & {
     chainId: ChainIdentifier,
-    address: string,
-    ticker: string,
-    decimals: number,
-    displayDecimals?: number,
-    name: string
-}
+    chain: "SC"
+
+    toString: () => `${ChainIdentifier}-${string}`
+};
 
 /**
  * Type guard for {@link SCToken} (token on the smart chain)
  * @category Tokens
  */
-export function isSCToken(obj: any): obj is SCToken {
+export function isSCToken<ChainIdentifier extends string = string>(obj: any, chainIdentifier?: ChainIdentifier[]): obj is SCToken<ChainIdentifier> {
     return typeof (obj) === "object" &&
         obj.chain === "SC" &&
         typeof (obj.chainId) === "string" &&
+        (chainIdentifier==null || chainIdentifier.includes(obj.chainId)) &&
         typeof (obj.address) === "string" &&
         typeof (obj.ticker) === "string" &&
         typeof (obj.decimals) === "number" &&
         typeof (obj.name) === "string";
 }
-
-/**
- * Union type for all token types (BTC or smart chain)
- *
- * @category Tokens
- */
-export type Token<ChainIdentifier extends string = string> = BtcToken | SCToken<ChainIdentifier>;
-
-/**
- * Type guard for an union {@link Token} type, encompassing all tokens (BTC or smart chain)
- *
- * @category Tokens
- */
-export function isToken(obj: any): obj is Token {
-    return isBtcToken(obj) || isSCToken(obj);
-}

package/src/types/TokenAmount.ts

@@ -9,8 +9,7 @@ import {toDecimal} from "../utils/Utils";
  * @category Tokens
  */
 export type TokenAmount<
-    ChainIdentifier extends string = string,
-    T extends Token<ChainIdentifier> = Token<ChainIdentifier>,
+    T extends Token = Token,
     Known extends boolean = boolean
 > = {
     /**
@@ -74,15 +73,14 @@ export type TokenAmount<
  * @internal
  */
 export function toTokenAmount<
-    ChainIdentifier extends string = string,
-    T extends Token<ChainIdentifier> = Token<ChainIdentifier>,
+    T extends Token = Token,
     Known extends boolean = boolean
 >(
     amount: Known extends true ? bigint : null,
     token: T,
     prices: ISwapPrice,
     pricingInfo?: PriceInfoType
-): TokenAmount<ChainIdentifier, T, Known> {
+): TokenAmount<T, Known> {
     if (amount == null) return {
         rawAmount: undefined,
         amount: "",
@@ -93,7 +91,7 @@ export function toTokenAmount<
         usdValue: () => Promise.resolve(NaN),
         toString: () => "??? " + token.ticker,
         isUnknown: true
-    } as TokenAmount<ChainIdentifier, T>;
+    } as TokenAmount<T>;
     const amountStr = toDecimal(amount, token.decimals, undefined, token.displayDecimals);
     const _amount = parseFloat(amountStr);
 
@@ -131,5 +129,5 @@ export function toTokenAmount<
         },
         toString: () => amountStr + " " + token.ticker,
         isUnknown: false
-    } as TokenAmount<ChainIdentifier, T>;
+    } as TokenAmount<T>;
 }

package/src/types/fees/Fee.ts

@@ -16,11 +16,11 @@ export type Fee<
     /**
      * Fee value equivalent in source token
      */
-    amountInSrcToken: TokenAmount<ChainIdentifier, TSrc, true>,
+    amountInSrcToken: TokenAmount<TSrc, true>,
     /**
      * Fee value equivalent in destination token
      */
-    amountInDstToken: TokenAmount<ChainIdentifier, TDst, true>,
+    amountInDstToken: TokenAmount<TDst, true>,
     /**
      * Fetches the current USD value of the fee
      *
@@ -49,7 +49,7 @@ export type Fee<
      *  base_fee + amount * percentage_fee
      */
     composition?: {
-        base: TokenAmount<ChainIdentifier>,
+        base: TokenAmount,
         percentage: PercentagePPM
     }
 }

package/src/utils/Utils.ts

@@ -1,7 +1,9 @@
 import {Buffer} from "buffer";
 import {randomBytes as randomBytesNoble} from "@noble/hashes/utils";
 import {sha256} from "@noble/hashes/sha2";
-import {BigIntBufferUtils} from "@atomiqlabs/base";
+import {BigIntBufferUtils, ChainType} from "@atomiqlabs/base";
+import {IFromBTCLNWrapper} from "../swaps/escrow_swaps/frombtc/IFromBTCLNWrapper";
+import {UserError} from "../errors/UserError";
 
 /**
  * Returns a promise that rejects if the passed promise resolves to `undefined` or `null`
@@ -179,4 +181,18 @@ export function toDecimal(amount: bigint, decimalCount: number, cut?: boolean, d
     if (displayDecimals === 0) return amountStr.substring(0, splitPoint);
     if (displayDecimals != null && cutTo > displayDecimals) cutTo = displayDecimals;
     return amountStr.substring(0, splitPoint) + "." + decimalPart.substring(0, cutTo);
-}
+}
+
+export function parseHashValueExact32Bytes(value?: Buffer | string, variableName?: string): Buffer | undefined {
+    let hash: Buffer | undefined;
+    if(typeof(value)==="string") {
+        if(value.length!==64)
+            throw new UserError(`Invalid ${variableName} length, must be exactly 64 hexadecimal characters!`)
+        hash = Buffer.from(value, "hex");
+    } else {
+        hash = value;
+    }
+    if(hash!=null && hash.length!==32)
+        throw new UserError(`Invalid ${variableName} length, must be exactly 32 bytes!`);
+    return hash;
+}