@atomiqlabs/sdk 8.1.7 → 8.3.1

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

@@ -18,11 +18,36 @@ export type OnchainForGasWrapperOptions = ISwapWrapperOptions & {
 
 export type OnchainForGasSwapTypeDefinition<T extends ChainType> = SwapTypeDefinition<T, OnchainForGasWrapper<T>, OnchainForGasSwap<T>>;
 
+/**
+ * Trusted swap for Bitcoin -> Smart chains, to be used for minor amounts to get gas tokens on the
+ *  destination chain, which is only needed for Solana, which still uses legacy swaps
+ *
+ * @category Swaps
+ */
 export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, OnchainForGasSwapTypeDefinition<T>, OnchainForGasWrapperOptions> {
-    public readonly TYPE = SwapType.TRUSTED_FROM_BTC;
-    public readonly swapDeserializer = OnchainForGasSwap;
+    public readonly TYPE: SwapType.TRUSTED_FROM_BTC = SwapType.TRUSTED_FROM_BTC;
+    /**
+     * @internal
+     */
+    readonly _swapDeserializer = OnchainForGasSwap;
+
+    /**
+     * @internal
+     */
+    readonly _pendingSwapStates = [OnchainForGasSwapState.PR_CREATED];
+    /**
+     * @internal
+     */
+    protected readonly tickSwapState = undefined;
+    /**
+     * @internal
+     */
+    protected processEvent = undefined;
 
-    readonly btcRpc: BitcoinRpcWithAddressIndex<any>;
+    /**
+     * @internal
+     */
+    readonly _btcRpc: BitcoinRpcWithAddressIndex<any>;
 
     /**
      * @param chainIdentifier
@@ -47,30 +72,31 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
         events?: EventEmitter<{swapState: [ISwap]}>
     ) {
         super(chainIdentifier, unifiedStorage, unifiedChainEvents, chain, prices, tokens, options, events);
-        this.btcRpc = btcRpc;
+        this._btcRpc = btcRpc;
     }
 
     /**
-     * Returns a newly created swap, receiving 'amount' base units of gas token
+     * Returns a newly created trusted Bitcoin on-chain -> Smart chain swap, receiving
+     *  the specified amount of native token on the destination chain.
      *
-     * @param signer
-     * @param amount            Amount you wish to receive in base units
-     * @param lpOrUrl           Intermediary/Counterparty swap service Intermediary object or raw url
-     * @param refundAddress     Bitcoin address to receive refund on in case the counterparty cannot execute the swap
+     * @param recipient Address of the recipient on the smart chain destination chain
+     * @param amount Amount of native token to receive in base units
+     * @param lpOrUrl Intermediary (LP) to use for the swap
+     * @param refundAddress Bitcoin address to receive refund on in case the intermediary (LP) cannot execute the swap
      */
-    async create(signer: string, amount: bigint, lpOrUrl: Intermediary | string, refundAddress?: string): Promise<OnchainForGasSwap<T>> {
+    async create(recipient: string, amount: bigint, lpOrUrl: Intermediary | string, refundAddress?: string): Promise<OnchainForGasSwap<T>> {
         if(!this.isInitialized) throw new Error("Not initialized, call init() first!");
 
         const lpUrl = typeof(lpOrUrl)==="string" ? lpOrUrl : lpOrUrl.url;
 
-        const token = this.chain.getNativeCurrencyAddress();
+        const token = this._chain.getNativeCurrencyAddress();
 
         const resp = await TrustedIntermediaryAPI.initTrustedFromBTC(this.chainIdentifier, lpUrl, {
-            address: signer,
+            address: recipient,
             amount,
             refundAddress,
             token
-        }, this.options.getRequestTimeout);
+        }, this._options.getRequestTimeout);
 
         if(resp.total !== amount) throw new IntermediaryError("Invalid total returned");
 
@@ -79,7 +105,7 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
                 {swapFeePPM: 10000, swapBaseFee: 10} :
                 lpOrUrl.services[SwapType.TRUSTED_FROM_BTC],
             false, resp.amountSats,
-            amount, this.chain.getNativeCurrencyAddress(), {}
+            amount, this._chain.getNativeCurrencyAddress(), {}
         );
 
         const quote = new OnchainForGasSwap(this, {
@@ -88,7 +114,7 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
             address: resp.btcAddress,
             inputAmount: resp.amountSats,
             outputAmount: resp.total,
-            recipient: signer,
+            recipient,
             refundAddress,
             pricingInfo,
             url: lpUrl,
@@ -102,8 +128,4 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
         return quote;
     }
 
-    public readonly pendingSwapStates = [OnchainForGasSwapState.PR_CREATED];
-    public readonly tickSwapState = undefined;
-    protected processEvent = undefined;
-
 }

package/src/types/AmountData.ts

@@ -1,5 +1,6 @@
 /**
- * Simple amount definition for swap operations
+ * Amount, token and exact input object for initiating swap operations
+ *
  * @category Tokens
  */
 export type AmountData = {

package/src/types/CustomPriceFunction.ts

@@ -1,5 +1,11 @@
 /**
- * Custom pricing callback function type
+ * Custom pricing callback function type, fetches the USD price for the provided array
+ *  of token tickers.
+ *
+ * @param tickers Tickers of the tokens to fetch USD price for
+ * @param abortSignal Abort signal
+ * @returns USD prices of the passed tickers in the order that they were passed
+ *
  * @category Pricing and LPs
  */
 export type CustomPriceFunction = (tickers: string[], abortSignal?: AbortSignal) => Promise<number[]>;

package/src/types/SwapExecutionAction.ts

@@ -1,8 +1,87 @@
 import {ChainType} from "@atomiqlabs/base";
+import {Transaction} from "@scure/btc-signer";
 
-export type SwapExecutionAction<T extends ChainType> = {
-    name: "Payment" | "Commit" | "Claim",
+/**
+ * Swap execution action requiring a payment of the provided bolt11 lightning network invoice
+ *
+ * @category Swaps
+ */
+export type SwapExecutionActionLightning = {
+    name: "Payment",
     description: string,
-    chain: "LIGHTNING" | "BITCOIN" | T["ChainId"],
-    txs: any[]
-};
+    chain: "LIGHTNING",
+    txs: {
+        type: "BOLT11_PAYMENT_REQUEST",
+        address: string,
+        hyperlink: string
+    }[]
+}
+
+/**
+ * Swap execution action on on-chain Bitcoin, has following types:
+ * - `"ADDRESS"` - Destination bitcoin address and BTC amount to be sent
+ * - `"FUNDED_PSBT"` - A ready to sign PSBT with the inputs populated from the provided bitcoin wallet address
+ * - `"RAW_PSBT"` - Raw PSBT without the inputs, the implementor needs to add the input UTXOs before signing
+ *  the transaction
+ *
+ * @category Swaps
+ */
+export type SwapExecutionActionBitcoin<
+    T extends "ADDRESS" | "FUNDED_PSBT" | "RAW_PSBT" = "ADDRESS" | "FUNDED_PSBT" | "RAW_PSBT"
+> = {
+    name: "Payment",
+    description: string,
+    chain: "BITCOIN",
+    txs: (T extends "ADDRESS" ? {
+        type: "ADDRESS",
+        amount: number,
+        address: string,
+        hyperlink: string
+    } : T extends "FUNDED_PSBT" ? {
+        type: "FUNDED_PSBT",
+        psbt: Transaction,
+        psbtHex: string,
+        psbtBase64: string,
+        signInputs: number[]
+    } : {
+        type: "RAW_PSBT",
+        psbt: Transaction,
+        psbtHex: string,
+        psbtBase64: string,
+        in1sequence: number
+    })[]
+}
+
+/**
+ * Swap execution action for committing (initiating) the escrow on the smart chain side
+ *
+ * @category Swaps
+ */
+export type SwapExecutionActionCommit<T extends ChainType> = {
+    name: "Commit",
+    description: string,
+    chain: T["ChainId"],
+    txs: T["TX"][]
+}
+
+/**
+ * Swap execution action for claiming (settling) the swap on the smart chain side
+ *
+ * @category Swaps
+ */
+export type SwapExecutionActionClaim<T extends ChainType> = {
+    name: "Claim",
+    description: string,
+    chain: T["ChainId"],
+    txs: T["TX"][]
+}
+
+/**
+ * Swap execution action, a single step in the swapping process
+ *
+ * @category Swaps
+ */
+export type SwapExecutionAction<T extends ChainType> = SwapExecutionActionLightning |
+    SwapExecutionActionBitcoin |
+    SwapExecutionActionCommit<T> |
+    SwapExecutionActionClaim<T>;

package/src/types/SwapWithSigner.ts

@@ -3,9 +3,12 @@ import {ChainType} from "@atomiqlabs/base";
 import {IToBTCSwap} from "../swaps/escrow_swaps/tobtc/IToBTCSwap";
 import {IFromBTCSelfInitSwap} from "../swaps/escrow_swaps/frombtc/IFromBTCSelfInitSwap";
 import {FromBTCLNSwap} from "../swaps/escrow_swaps/frombtc/ln/FromBTCLNSwap";
+import {FromBTCLNAutoSwap} from "../swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoSwap";
+import {SpvFromBTCSwap} from "../swaps/spv_swaps/SpvFromBTCSwap";
 
 /**
- * Proxy type that auto-injects signer into swap methods
+ * Proxy type that auto-injects a smart chain signer into swap methods
+ *
  * @category Swaps
  */
 export type SwapWithSigner<T extends ISwap> = {
@@ -19,12 +22,13 @@ export type SwapWithSigner<T extends ISwap> = {
 
 /**
  * Wraps a swap with automatic signer injection for methods like commit, refund, and claim
+ *
  * @category Swaps
+ * @internal
  */
 export function wrapSwapWithSigner<C extends ChainType, T extends ISwap<C>>(swap: T, signer: C["Signer"]): SwapWithSigner<T> {
     return new Proxy(swap, {
         get: (target, prop, receiver) => {
-            // Override the "sayGoodbye" method
             if (prop === "commit") {
                 if(swap instanceof IToBTCSwap || swap instanceof IFromBTCSelfInitSwap) {
                     return (abortSignal?: AbortSignal, skipChecks?: boolean) =>
@@ -38,7 +42,7 @@ export function wrapSwapWithSigner<C extends ChainType, T extends ISwap<C>>(swap
                 }
             }
             if (prop === "claim") {
-                if(swap instanceof IFromBTCSelfInitSwap) {
+                if(swap instanceof IFromBTCSelfInitSwap || swap instanceof FromBTCLNAutoSwap || swap instanceof SpvFromBTCSwap) {
                     return (abortSignal?: AbortSignal) =>
                         swap.claim(signer, abortSignal);
                 }

package/src/types/Token.ts

@@ -1,5 +1,6 @@
 /**
- * Bitcoin token type (on-chain or lightning)
+ * Bitcoin token type (BTC on on-chain or lightning)
+ *
  * @category Tokens
  */
 export type BtcToken<L = boolean> = {
@@ -12,7 +13,8 @@ export type BtcToken<L = boolean> = {
 };
 
 /**
- * Type guard for BtcToken
+ * Type guard for {@link BtcToken} (token on the bitcoin network - lightning or on-chain)
+ *
  * @category Tokens
  */
 export function isBtcToken(obj: any): obj is BtcToken {
@@ -26,6 +28,7 @@ export function isBtcToken(obj: any): obj is BtcToken {
 
 /**
  * Predefined Bitcoin token constants
+ *
  * @category Tokens
  */
 export const BitcoinTokens: {
@@ -47,8 +50,10 @@ export const BitcoinTokens: {
         name: "Bitcoin (lightning L2)"
     }
 };
+
 /**
- * Smart Chain token type
+ * Token on the smart chain
+ *
  * @category Tokens
  */
 export type SCToken<ChainIdentifier extends string = string> = {
@@ -62,7 +67,7 @@ export type SCToken<ChainIdentifier extends string = string> = {
 }
 
 /**
- * Type guard for SCToken
+ * Type guard for {@link SCToken} (token on the smart chain)
  * @category Tokens
  */
 export function isSCToken(obj: any): obj is SCToken {
@@ -77,12 +82,14 @@ export function isSCToken(obj: any): obj is SCToken {
 
 /**
  * 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 Token
+ * 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 {

package/src/types/TokenAmount.ts

@@ -5,6 +5,7 @@ import {toDecimal} from "../utils/Utils";
 
 /**
  * Represents a token amount along with its formatted values and USD valuation helpers
+ *
  * @category Tokens
  */
 export type TokenAmount<
@@ -68,7 +69,9 @@ export type TokenAmount<
 
 /**
  * Factory function to create a TokenAmount
+ *
  * @category Tokens
+ * @internal
  */
 export function toTokenAmount<
     ChainIdentifier extends string = string,

package/src/types/fees/Fee.ts

@@ -3,8 +3,9 @@ import {TokenAmount} from "../TokenAmount";
 import {Token} from "../Token";
 
 /**
- * Represents a fee in both source and destination tokens, as well as providing USD valuation helpers and
+ * Fee represented in both, source and destination tokens, as well as providing USD valuation helpers and
  *  fee composition
+ *
  * @category Pricing and LPs
  */
 export type Fee<

package/src/types/fees/FeeBreakdown.ts

@@ -2,7 +2,8 @@ import {FeeType} from "../../enums/FeeType";
 import {Fee} from "./Fee";
 
 /**
- * Breakdown of fees by type (swap fee vs network fee)
+ * Breakdown of fees by type (swap fee, network fee, etc.)
+ *
  * @category Pricing and LPs
  */
 export type FeeBreakdown<ChainIdentifier extends string = string> = {

package/src/types/fees/PercentagePPM.ts

@@ -1,5 +1,6 @@
 /**
  * Parts-per-million fee representation with conversion helpers
+ *
  * @category Pricing and LPs
  */
 export type PercentagePPM = {
@@ -11,6 +12,7 @@ export type PercentagePPM = {
 
 /**
  * Converts parts-per-million to percentage representation
+ *
  * @category Pricing and LPs
  */
 export function ppmToPercentage(ppm: bigint): PercentagePPM {

package/src/types/lnurl/LNURLPay.ts

@@ -1,5 +1,6 @@
 /**
- * LNURL-pay request parameters
+ * Response of the LNURL-pay link
+ *
  * @category Bitcoin
  */
 export type LNURLPayParams = {
@@ -14,13 +15,15 @@ export type LNURLPayParams = {
 }
 
 /**
- * LNURL-pay parameters with URL
+ * Response of the LNURL-pay link with the added original url
+ *
  * @category Bitcoin
  */
 export type LNURLPayParamsWithUrl = LNURLPayParams & { url: string };
 
 /**
- * LNURL-pay specification
+ * Parsed LNURL-pay specification
+ *
  * @category Bitcoin
  */
 export type LNURLPay = {
@@ -35,16 +38,20 @@ export type LNURLPay = {
 }
 
 /**
- * Type guard for LNURL-pay parameters
+ * Type guard for {@link LNURLPayParams}
+ *
  * @category Bitcoin
+ * @internal
  */
 export function isLNURLPayParams(obj: any): obj is LNURLPayParams {
     return obj.tag === "payRequest";
 }
 
 /**
- * Type guard for LNURL-pay
+ * Type guard for {@link LNURLPay}
+ *
  * @category Bitcoin
+ * @internal
  */
 export function isLNURLPay(value: any): value is LNURLPay {
     return (
@@ -62,7 +69,8 @@ export function isLNURLPay(value: any): value is LNURLPay {
 }
 
 /**
- * Decoded LNURL-pay success action
+ * Decoded LNURL-pay success action, revealed after a lightning payment is finished
+ *
  * @category Bitcoin
  */
 export type LNURLDecodedSuccessAction = {

package/src/types/lnurl/LNURLWithdraw.ts

@@ -1,5 +1,6 @@
 /**
- * LNURL-withdraw request parameters
+ * Response of the LNURL-withdraw link
+ *
  * @category Bitcoin
  */
 export type LNURLWithdrawParams = {
@@ -15,13 +16,15 @@ export type LNURLWithdrawParams = {
 }
 
 /**
- * LNURL-withdraw parameters with URL
+ * Response of the LNURL-withdraw link with the added original url
+ *
  * @category Bitcoin
  */
 export type LNURLWithdrawParamsWithUrl = LNURLWithdrawParams & { url: string };
 
 /**
- * LNURL-withdraw specification
+ * Parsed LNURL-withdraw specification
+ *
  * @category Bitcoin
  */
 export type LNURLWithdraw = {
@@ -32,8 +35,10 @@ export type LNURLWithdraw = {
 }
 
 /**
- * Type guard for LNURL-withdraw
+ * Type guard for {@link LNURLWithdraw}
+ *
  * @category Bitcoin
+ * @internal
  */
 export function isLNURLWithdraw(value: any): value is LNURLWithdraw {
     return (
@@ -47,8 +52,10 @@ export function isLNURLWithdraw(value: any): value is LNURLWithdraw {
 }
 
 /**
- * Type guard for LNURL-withdraw parameters
+ * Type guard for {@link LNURLWithdrawParams}
+ *
  * @category Bitcoin
+ * @internal
  */
 export function isLNURLWithdrawParams(obj: any): obj is LNURLWithdrawParams {
     return obj.tag === "withdrawRequest";

package/src/types/wallets/LightningInvoiceCreateService.ts

@@ -0,0 +1,26 @@
+/**
+ * Invoice getter callback for the {@link LightningInvoiceCreateService}
+ */
+export type LightningWalletCallback = (valueSats: number, abortSignal?: AbortSignal) => Promise<string>;
+/**
+ * Service that creates on-demand fixed amount bolt11 lightning network invoices, optionally
+ *  specifying minimum and maximum swappable sats amount. This used for exact input Smart chain ->
+ *  Lightning swaps.
+ */
+export type LightningInvoiceCreateService = {
+    getInvoice: LightningWalletCallback,
+    minMsats?: bigint,
+    maxMSats?: bigint
+};
+
+/**
+ * Type guard for {@link LightningInvoiceCreateService}
+ *
+ * @internal
+ */
+export function isLightningInvoiceCreateService(obj: any): obj is LightningInvoiceCreateService {
+    return typeof (obj) === "object" &&
+        typeof (obj.getInvoice) === "function" &&
+        (obj.minMsats == null || typeof (obj.minMsats) === "bigint") &&
+        (obj.maxMSats == null || typeof (obj.maxMSats) === "bigint");
+}

package/src/types/wallets/MinimalBitcoinWalletInterface.ts

@@ -2,7 +2,8 @@ import {Transaction} from "@scure/btc-signer";
 
 /**
  * A type with minimum possible required data about a bitcoin wallet to be able to estimate fees and produce unsigned
- *  PSBTs
+ *  funded PSBTs with address's UTXOs
+ *
  * @category Bitcoin
  */
 export type MinimalBitcoinWalletInterface = {
@@ -12,6 +13,7 @@ export type MinimalBitcoinWalletInterface = {
 
 /**
  * A type with minimum possible required data about a bitcoin wallet to be able to estimate fees and sign PSBTs
+ *
  * @category Bitcoin
  */
 export type MinimalBitcoinWalletInterfaceWithSigner = MinimalBitcoinWalletInterface & {

package/src/types/wallets/MinimalLightningNetworkWalletInterface.ts

@@ -1,5 +1,7 @@
 /**
- * A type with minimum possible required functionality to be usable with lightning network swaps
+ * A type with minimum possible required functionality to be usable with lightning network swaps, i.e.
+ *  a function to pay bolt11 lightning network invoices.
+ *
  * @category Bitcoin
  */
 export type MinimalLightningNetworkWalletInterface = {

package/src/utils/BitcoinUtils.ts

@@ -3,6 +3,11 @@ import {Buffer} from "buffer";
 import {Address, OutScript, Transaction} from "@scure/btc-signer";
 import {CoinselectAddressTypes} from "../bitcoin/coinselect2";
 
+
+export function fromOutputScript(network: BTC_NETWORK, outputScriptHex: string): string {
+    return Address(network).encode(OutScript.decode(Buffer.from(outputScriptHex, "hex")));
+}
+
 export function toOutputScript(network: BTC_NETWORK, address: string): Buffer {
     const outputScript = Address(network).decode(address);
     switch(outputScript.type) {

package/src/utils/SwapUtils.ts

@@ -12,7 +12,10 @@ import {LnForGasSwap} from "../swaps/trusted/ln/LnForGasSwap";
 import {ISwap} from "../swaps/ISwap";
 
 /**
- * Type mapping from SwapType enum to specific swap class implementations
+ * Type mapping from SwapType enum to specific swap class implementations, it is important
+ *  to pass the chain type generic, since different chains support different swap protocols
+ *  for some directions.
+ *
  * @category Utilities
  */
 export type SwapTypeMapping<T extends ChainType> = {
@@ -28,6 +31,7 @@ export type SwapTypeMapping<T extends ChainType> = {
 
 /**
  * Type guard to check if a swap is of a specific swap type
+ *
  * @category Utilities
  */
 export function isSwapType<T extends ChainType, S extends SwapType>(swap: ISwap<T>, swapType: S): swap is SwapTypeMapping<T>[S] {
@@ -36,3 +40,59 @@ export function isSwapType<T extends ChainType, S extends SwapType>(swap: ISwap<
     if(swap.getType()===SwapType.FROM_BTCLN_AUTO && swapType===SwapType.FROM_BTCLN) return true;
     return swap.getType()===swapType;
 }
+
+/**
+ * Helper information about various swap protocol and their features:
+ * - `requiresInputWallet`: Whether a swap requires a connected wallet on the input chain able to sign
+ *  arbitrary transaction
+ * - `requiresOutputWallet`: Whether a swap requires a connected wallet on the output chain able to sign
+ *  arbitrary transactions
+ * - `supportsGasDrop`: Whether a swap supports the "gas drop" feature, allowing to user to receive a small
+ *  amount of native token as part of the swap when swapping to smart chains
+ */
+export const SwapProtocolInfo = {
+    [SwapType.TO_BTC]: {
+        requiresInputWallet: true,
+        requiresOutputWallet: false,
+        supportsGasDrop: false
+    },
+    [SwapType.TO_BTCLN]: {
+        requiresInputWallet: true,
+        requiresOutputWallet: false,
+        supportsGasDrop: false
+    },
+    [SwapType.FROM_BTC]: {
+        requiresInputWallet: false,
+        requiresOutputWallet: true,
+        supportsGasDrop: false
+    },
+    [SwapType.FROM_BTCLN]: {
+        requiresInputWallet: false,
+        requiresOutputWallet: true,
+        supportsGasDrop: false
+    },
+    [SwapType.SPV_VAULT_FROM_BTC]: {
+        requiresInputWallet: true,
+        requiresOutputWallet: false,
+        supportsGasDrop: true
+    },
+    [SwapType.FROM_BTCLN_AUTO]: {
+        requiresInputWallet: false,
+        requiresOutputWallet: false,
+        supportsGasDrop: true
+    },
+    [SwapType.TRUSTED_FROM_BTC]: {
+        requiresInputWallet: false,
+        requiresOutputWallet: false,
+        supportsGasDrop: false
+    },
+    [SwapType.TRUSTED_FROM_BTCLN]: {
+        requiresInputWallet: false,
+        requiresOutputWallet: false,
+        supportsGasDrop: false
+    }
+} as const satisfies Record<SwapType, {
+    requiresInputWallet: boolean,
+    requiresOutputWallet: boolean,
+    supportsGasDrop: boolean
+}>;

package/src/utils/TokenUtils.ts

@@ -4,21 +4,29 @@ import {fromDecimal, toDecimal} from "./Utils";
 
 /**
  * Converts a raw bigint amount to a human-readable string with decimals
+ *
+ * @param amount Amount in base units
+ * @param token Token
+ *
  * @category Utilities
  */
-export function toHumanReadableString(amount: bigint, currencySpec: Token): string {
+export function toHumanReadableString(amount: bigint, token: Token): string {
     if(amount==null) return "";
-    return toDecimal(amount, currencySpec.decimals, undefined, currencySpec.displayDecimals);
+    return toDecimal(amount, token.decimals, undefined, token.displayDecimals);
 }
 
 /**
  * Parses a human-readable decimal string to a raw bigint amount
+ *
+ * @param amount Amount in base units
+ * @param token Token
+ *
  * @category Utilities
  */
-export function fromHumanReadableString(amount: string, currencySpec: Token): bigint | null {
+export function fromHumanReadableString(amount: string, token: Token): bigint | null {
     if(amount==="" || amount==null) return null;
     try {
-        return fromDecimal(amount, currencySpec.decimals);
+        return fromDecimal(amount, token.decimals);
     } catch (e) {
         return null;
     }