@gardenfi/core 2.2.1 → 2.3.0

package/dist/src/lib/bitcoin/wallet/wallet.d.ts

@@ -0,0 +1,103 @@
+import { networks, payments } from 'bitcoinjs-lib';
+import { IBitcoinProvider } from '../provider/provider.interface';
+import { AddressType } from '../interface';
+import { AbstractBitcoinWallet } from './abstractWallet';
+import { BitcoinWalletConfig } from './wallet.interface';
+import { AddSignature } from '../sig';
+
+export type BitcoinWalletOpts = {
+    privateKey: string;
+    provider: IBitcoinProvider;
+    pkPath: string;
+    pkType: AddressType;
+};
+export declare class BitcoinWallet extends AbstractBitcoinWallet {
+    private readonly provider;
+    private signer;
+    private readonly minAmt;
+    private readonly network;
+    private pkType;
+    private readonly path;
+    /**
+     * @constructor
+     * @param {BitcoinWalletOpts} opts
+     * @param {string} opts.privateKey
+     * @param {IBitcoinProvider} opts.provider
+     * @param {number} opts.pkIndex - The address_index as per BIP44
+     */
+    constructor({ privateKey, provider, pkPath, pkType }: BitcoinWalletOpts);
+    /**
+     * @deprecated
+     * Switch to `fromPrivateKey` if you have the private key
+     * else use multi-key wallet's `fromMnemonic`
+     */
+    static fromMnemonic(mnemonic: string, provider: IBitcoinProvider, opts?: {
+        index: number;
+    }): BitcoinWallet;
+    /**
+     * Initiates a Bitcoin wallet from a private key
+     *
+     * @param {string} privateKey - The private key
+     * @param {IBitcoinProvider} provider - The Bitcoin provider
+     *
+     * Note: Make sure to pass the pkType if you want to use a specific address type (p2wpkh(segwit), p2sh-p2wpkh, p2pkh(legacy))
+     */
+    static fromPrivateKey(privateKey: string, provider: IBitcoinProvider, opts?: {
+        /**
+         * The address type - p2wpkh (segwit), p2sh-p2wpkh, p2pkh(legacy)
+         */
+        pkType?: AddressType;
+        pkPath?: string;
+    }): BitcoinWallet;
+    /**
+     * Creates a random Bitcoin wallet
+     */
+    static createRandom(provider: IBitcoinProvider): BitcoinWallet;
+    static fromWIF(wif: string, provider: IBitcoinProvider, opts?: {
+        pkType?: AddressType;
+        pkPath?: string;
+    }): BitcoinWallet;
+    /**
+     * @override
+     * @returns {Promise<BitcoinWalletConfig>} Bitcoin wallet config including network, derivation path, and index
+     */
+    walletConfig(): BitcoinWalletConfig;
+    /**
+     * Spends bitcoin from a script to a given address.
+     *
+     * @param {Buffer} script - The locking script
+     * @param {string} scriptAddress - The address of the script
+     * @param {Object} opts - The options
+     * @param {string} [opts.toAddress] - The address of the recipient. If not provided then the wallet address is used as the recipient.
+     * @param {number} [opts.fee] - The fee
+     * @param {number} [opts.nSequence] - The sequence number
+     * @param {Buffer[]} [opts.unlockScript] - The unlock script. Required for p2sh
+     * @param {Buffer[]} [opts.witness] - The witness. Required for p2wsh, p2tr
+     * @returns {Promise<string>} Transaction ID
+     */
+    spend(script: Buffer, scriptAddress: string, { toAddress, fee, nSequence, unlockScript, // only for p2sh
+    witness, }: {
+        toAddress?: string;
+        fee?: number;
+        nSequence?: number;
+        witness?: (Buffer | AddSignature)[];
+        unlockScript?: (payments.StackElement | AddSignature)[];
+    }): Promise<string>;
+    /**
+     * Returns the address of the wallet
+     * @returns {Promise<string>}
+     */
+    getAddress(): Promise<string>;
+    getProvider(): Promise<IBitcoinProvider>;
+    getBalance(): Promise<number>;
+    getPublicKey(): Promise<string>;
+    getNetwork(): Promise<networks.Network>;
+    static generateUnsignedPSBT(provider: IBitcoinProvider, network: networks.Network, fromAddress: string, toAddress: string, amt: number, fee?: number): Promise<{
+        txHex: string;
+        utxoCount: number;
+    }>;
+    private _send;
+    send(toAddress: string, amt: number, fee?: number): Promise<string>;
+    sign(hexMsg: string): Promise<string>;
+    signSchnorr(buf: Buffer): Promise<Buffer>;
+}

package/dist/src/lib/bitcoin/wallet/wallet.interface.d.ts

@@ -0,0 +1,79 @@
+import { Network, payments } from 'bitcoinjs-lib';
+import { IBaseWallet } from './baseWallet';
+import { BitcoinNetwork, IBitcoinProvider, Urgency } from '../provider/provider.interface';
+import { AddSignature, SigHashType } from '../sig';
+
+/**
+ * @interface IBitcoinWallet
+ */
+export interface IBitcoinWallet extends IBaseWallet {
+    /**
+     * @returns {Promise<number>} Balance held by the wallet in satoshis.
+     */
+    getBalance(): Promise<number>;
+    /**
+     * @returns {Promise<string>} Public key of the wallet
+     */
+    getPublicKey(): Promise<string>;
+    /**
+     * @returns {Promise<Network>} Network of the wallet provided during initialization
+     */
+    getNetwork(): Promise<Network>;
+    /**
+     * @returns {Promise<IBitcoinProvider>} Provider of the wallet that gives read only access to the mempool
+     */
+    getProvider(): Promise<IBitcoinProvider>;
+    /**
+     * Fee for a transaction according to the urgency
+     *
+     * @param {number} amount - in satoshis
+     * @param {Urgency} urgency - urgency of the fee
+     * @returns {Promise<number>} Fee suggested by the provider
+     */
+    suggestFee(amount: number, urgency: Urgency): Promise<number>;
+    signSchnorr(buf: Buffer): Promise<Buffer>;
+    /**
+     * Sends bitcoins to a recipient
+     *
+     * @param {string} toAddress - Address of the recipient
+     * @param {number} amt - in satoshis
+     * @param {number} [fee]
+     * @returns {Promise<string>} Tx id of the sent transaction
+     */
+    send(toAddress: string, amt: number, fee?: number): Promise<string>;
+    /**
+     * Spends bitcoin from a script to a given address.
+     *
+     * @param {Buffer} script - The locking script
+     * @param {Buffer[]} witness - The witnesses
+     * @param {string} [toAddress] - The address of the recipient. If not provided then the wallet address is used as the recipient.
+     * @param {number} [nSequence] - The sequence number
+     * @returns {Promise<string>} Transaction ID
+     */
+    spend(script: Buffer, scriptAddress: string, { toAddress, fee, nSequence, unlockScript, // only for p2sh
+    witness, }: {
+        toAddress?: string;
+        fee?: number;
+        nSequence?: number;
+        witness?: (Buffer | AddSignature)[];
+        unlockScript?: (payments.StackElement | AddSignature)[];
+    }): Promise<string>;
+    /**
+     * @returns {BitcoinWalletConfig}
+     */
+    walletConfig(): BitcoinWalletConfig;
+    addSignatureSegwitV0(type?: SigHashType): AddSignature;
+    addSignatureP2sh(type?: SigHashType): AddSignature;
+    addSignatureSegwitV1(type?: SigHashType): AddSignature;
+}
+/**
+ * @typedef {Object} BitcoinWalletConfig
+ *
+ * @property {Network} network - The network of the wallet
+ * @property {string} path - The derivation path
+ */
+export type BitcoinWalletConfig = {
+    network: BitcoinNetwork;
+    path: string;
+    addressType?: string;
+};

package/dist/src/lib/blockNumberFetcher/blockNumber.d.ts

@@ -1,6 +1,5 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { Chain } from '@gardenfi/orderbook';
-import { Environment } from '@gardenfi/utils';
+import { Environment, AsyncResult } from '@gardenfi/utils';
 
 type Response = {
     [key in Chain]: number;

package/dist/src/lib/evm/htlc/evmHTLC.d.ts

@@ -1,6 +1,6 @@
-import { IHTLCWallet } from '@catalogfi/wallets';
 import { EVMSwapConfig } from './evmHTLC.types';
 import { Address, WalletClient } from 'viem';
+import { IHTLCWallet } from '../../htlc.interface';
 
 export declare class EVMHTLC implements IHTLCWallet {
     private swap;

package/dist/src/lib/evm/htlc/evmHTLC.types.d.ts

@@ -1,5 +1,5 @@
-import { MarkRequired } from '@catalogfi/utils';
-import { OnChainIdentifier } from '@catalogfi/wallets';
+import { MarkRequired } from '@gardenfi/utils';
+import { OnChainIdentifier } from '../../identifier';
 import { Address } from 'viem';
 
 export type AtomicSwapConfig = {

package/dist/src/lib/evm/relay/evmRelay.types.d.ts

@@ -1,6 +1,5 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { IStore } from '@gardenfi/utils';
+import { AsyncResult, IStore } from '@gardenfi/utils';
 import { WalletClient } from 'viem';
 
 export type EVMRelayOpts = {

package/dist/src/lib/garden/garden.d.ts

@@ -1,13 +1,12 @@
 import { ISecretManager } from './../secretManager/secretManager.types';
-import { AsyncResult } from '@catalogfi/utils';
 import { GardenEvents, IGardenJS, SwapParams, GardenConfigWithHTLCs, GardenConfigWithWallets } from './garden.types';
 import { IOrderbook, MatchedOrder } from '@gardenfi/orderbook';
-import { EventBroker, IAuth, DigestKey } from '@gardenfi/utils';
+import { EventBroker, IAuth, DigestKey, AsyncResult } from '@gardenfi/utils';
 import { IQuote } from '../quote/quote.types';
-import { IBitcoinWallet } from '@catalogfi/wallets';
 import { IBlockNumberFetcher } from '../blockNumberFetcher/blockNumber';
 import { IEVMHTLC } from '../evm/htlc.types';
 import { IStarknetHTLC } from '../starknet/starknetHTLC.types';
+import { IBitcoinWallet } from '../bitcoin/wallet/wallet.interface';
 import { ISolanaHTLC } from '../solana/htlc/ISolanaHTLC';
 
 export declare class Garden extends EventBroker<GardenEvents> implements IGardenJS {

package/dist/src/lib/garden/garden.types.d.ts

@@ -1,16 +1,15 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { AffiliateFeeOptionalChainAsset, Asset, IOrderbook, MatchedOrder } from '@gardenfi/orderbook';
 import { OrderStatus } from '../orderStatus/status';
-import { Environment, EventBroker, IAuth, DigestKey } from '@gardenfi/utils';
+import { AsyncResult, Environment, EventBroker, IAuth, DigestKey } from '@gardenfi/utils';
 import { ISecretManager } from '../secretManager/secretManager.types';
 import { IQuote } from '../quote/quote.types';
 import { IBlockNumberFetcher } from '../blockNumberFetcher/blockNumber';
-import { BitcoinWallet, IBitcoinWallet } from '@catalogfi/wallets';
 import { IEVMHTLC } from '../evm/htlc.types';
 import { IStarknetHTLC } from '../starknet/starknetHTLC.types';
 import { AccountInterface } from 'starknet';
 import { WalletClient } from 'viem';
 import { Api } from '../constants';
+import { IBitcoinWallet } from '../bitcoin/wallet/wallet.interface';
 import { ISolanaHTLC } from '../solana/htlc/ISolanaHTLC';
 import { AnchorProvider } from '@coral-xyz/anchor';
 
@@ -159,7 +158,7 @@ export type GardenCoreConfig = {
     orderbook?: IOrderbook;
     quote?: IQuote;
     blockNumberFetcher?: IBlockNumberFetcher;
-    btcWallet?: BitcoinWallet;
+    btcWallet?: IBitcoinWallet;
     solanaProgramAddress?: string;
 };
 export type GardenHTLCModules = {

package/dist/src/lib/htlc.interface.d.ts

@@ -0,0 +1,7 @@
+interface IHTLCWallet {
+    id(): string;
+    init(): Promise<string>;
+    redeem(secret: string, receiver?: string): Promise<string>;
+    refund(receiver?: string): Promise<string>;
+}
+export type { IHTLCWallet };

package/dist/src/lib/identifier.d.ts

@@ -0,0 +1,19 @@
+import { Address } from 'viem';
+
+export declare class OnChainIdentifier {
+    isEVM: boolean;
+    address: string | Address;
+    private constructor();
+    static from_evm(address: Address): OnChainIdentifier;
+    static from_btc(address: string): OnChainIdentifier;
+    unwrap_evm(): Address;
+    unwrap_btc(): string;
+    isEvm(): this is {
+        address: Address;
+        isEVM: true;
+    };
+    isBtc(): this is {
+        address: string;
+        isEVM: false;
+    };
+}

package/dist/src/lib/quote/quote.d.ts

@@ -1,18 +1,15 @@
-import { AsyncResult, Request } from '@catalogfi/utils';
-import { IQuote, QuoteResponse, Strategies } from './quote.types';
-import { Asset, CreateOrderRequestWithAdditionalData, CreateOrderReqWithStrategyId } from '@gardenfi/orderbook';
+import { IQuote, QuoteResponse, Strategies, QuoteParamsForAssets } from './quote.types';
+import { CreateOrderRequestWithAdditionalData, CreateOrderReqWithStrategyId } from '@gardenfi/orderbook';
+import { AsyncResult, Err, Ok, Request as UtilsRequest } from '@gardenfi/utils';
 
 export declare class Quote implements IQuote {
     private quoteUrl;
     constructor(quoteUrl: string);
-    getQuoteFromAssets(fromAsset: Asset, toAsset: Asset, amount: number, isExactOut?: boolean, options?: {
-        affiliateFee?: number;
-        request?: Request;
-    }): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<QuoteResponse, never>>;
+    getQuoteFromAssets({ fromAsset, toAsset, amount, isExactOut, options, }: QuoteParamsForAssets): Promise<Err<string> | Ok<QuoteResponse>>;
     getQuote(orderpair: string, amount: number, isExactOut?: boolean, options?: {
         affiliateFee?: number;
-        request?: Request;
-    }): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<QuoteResponse, never>>;
+        request?: UtilsRequest;
+    }): Promise<Err<string> | Ok<QuoteResponse>>;
     getAttestedQuote(order: CreateOrderReqWithStrategyId): AsyncResult<CreateOrderRequestWithAdditionalData, string>;
-    getStrategies(): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<Strategies, never>>;
+    getStrategies(): Promise<Err<string> | Ok<Strategies>>;
 }

package/dist/src/lib/quote/quote.types.d.ts

@@ -1,6 +1,5 @@
-import { AsyncResult, Request } from '@catalogfi/utils';
 import { Asset, Chain, CreateOrderRequestWithAdditionalData, CreateOrderReqWithStrategyId } from '@gardenfi/orderbook';
-import { APIResponse } from '@gardenfi/utils';
+import { APIResponse, AsyncResult, Request } from '@gardenfi/utils';
 
 export interface IQuote {
     /**
@@ -13,10 +12,7 @@ export interface IQuote {
      * @param options { affiliateFee?: number; request?: Request } - The options for the quote request, affiliate fee in bps and request object
      *
      */
-    getQuoteFromAssets(fromAsset: Asset, toAsset: Asset, amount: number, isExactOut: boolean, options?: {
-        affiliateFee?: number;
-        request?: Request;
-    }): AsyncResult<QuoteResponse, string>;
+    getQuoteFromAssets(params: QuoteParamsForAssets): AsyncResult<QuoteResponse, string>;
     /**
      * Get a quote for the given orderpair and amount
      * @param orderpair - A string representing the order pair for which the quote is requested.
@@ -28,10 +24,7 @@ export interface IQuote {
      * @param isExactOut - Whether the amount is exact out
      * @param options { affiliateFee?: number; request?: Request } - The options for the quote request, affiliate fee in bps and request object
      */
-    getQuote(orderpair: string, amount: number, isExactOut: boolean, options?: {
-        affiliateFee?: number;
-        request?: Request;
-    }): AsyncResult<QuoteResponse, string>;
+    getQuote(orderpair: string, amount: number, isExactOut: boolean, options?: QuoteOptions): AsyncResult<QuoteResponse, string>;
     /**
      * Attest the quote, server will return a signature by verifying and signing the quote according to the provided `strategy_id`
      * @param order - The order for which the attestation is requested. Order should include `strategy_id` in the `additional_data` field.
@@ -44,6 +37,22 @@ export interface IQuote {
      */
     getStrategies(): AsyncResult<Strategies, string>;
 }
+export type QuoteOptions = {
+    affiliateFee?: number;
+    request?: Request;
+};
+export type BaseQuoteParams = {
+    amount: number;
+    isExactOut?: boolean;
+    options?: QuoteOptions;
+};
+export type QuoteParamsForAssets = BaseQuoteParams & {
+    fromAsset: Asset;
+    toAsset: Asset;
+};
+export type QuoteParamsForOrderPair = BaseQuoteParams & {
+    orderpair: string;
+};
 export type QuoteResponse = {
     quotes: {
         [strategy_id: string]: string;

package/dist/src/lib/secretManager/secretManager.d.ts

@@ -1,5 +1,5 @@
 import { WalletClient } from 'viem';
-import { EventBroker } from '@gardenfi/utils';
+import { Err, EventBroker, Ok } from '@gardenfi/utils';
 import { ISecretManager, SecretManagerEvents } from './secretManager.types';
 
 export declare class SecretManager extends EventBroker<SecretManagerEvents> implements ISecretManager {
@@ -9,12 +9,12 @@ export declare class SecretManager extends EventBroker<SecretManagerEvents> impl
     private constructor();
     static fromDigestKey(digestKey: string): SecretManager;
     static fromWalletClient(walletClient: WalletClient): SecretManager;
-    initialize(): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<string, never>>;
+    initialize(): Promise<Err<string> | Ok<string>>;
     private deriveDigestKeyFromWalletClient;
-    getDigestKey(): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<string, never>>;
-    generateSecret(nonce: string): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<{
+    getDigestKey(): Promise<Err<string> | Ok<string>>;
+    generateSecret(nonce: string): Promise<Err<string> | Ok<{
         secret: `0x${string}`;
         secretHash: `0x${string}`;
-    }, never>>;
+    }>>;
     private signMessage;
 }

package/dist/src/lib/secretManager/secretManager.types.d.ts

@@ -1,5 +1,4 @@
-import { AsyncResult } from '@catalogfi/utils';
-import { EventBroker } from '@gardenfi/utils';
+import { AsyncResult, EventBroker } from '@gardenfi/utils';
 
 export type Secret = {
     secretHash: string;

package/dist/src/lib/solana/htlc/ISolanaHTLC.d.ts

@@ -1,5 +1,5 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult } from '@catalogfi/utils';
+import { AsyncResult } from '@gardenfi/utils';
 
 export interface ISolanaHTLC {
     /**

package/dist/src/lib/solana/htlc/solanaHTLC.d.ts

@@ -1,7 +1,7 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
 import { ISolanaHTLC } from './ISolanaHTLC';
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult } from '@catalogfi/utils';
+import { AsyncResult } from '@gardenfi/utils';
 
 /**
  * SolanaHTLC is an implementation of ISolanaHTLC that performs atomic swaps directly on-chain.

package/dist/src/lib/solana/relayer/solanaRelay.d.ts

@@ -1,6 +1,5 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { AsyncResult } from '@catalogfi/utils';
-import { Url } from '@gardenfi/utils';
+import { AsyncResult, Url } from '@gardenfi/utils';
 import { ISolanaHTLC } from '../htlc/ISolanaHTLC';
 import { MatchedOrder } from '@gardenfi/orderbook';
 

package/dist/src/lib/starknet/checkAllowanceAndApprove.d.ts

@@ -1,5 +1,5 @@
 import { AccountInterface, RpcProvider } from 'starknet';
-import { AsyncResult } from '@catalogfi/utils';
+import { AsyncResult } from '@gardenfi/utils';
 
 export declare const checkAllowanceAndApprove: (account: AccountInterface, tokenAddress: string, htlcAddress: string, amount: bigint, starknetProvider: RpcProvider) => AsyncResult<string, string>;
 export declare const checkAllowance: (accountAddress: string, tokenAddress: string, htlcAddress: string, starknetProvider: RpcProvider) => AsyncResult<bigint, string>;

package/dist/src/lib/starknet/htlc/starknetHTLC.d.ts

@@ -1,7 +1,6 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult } from '@catalogfi/utils';
 import { Account, CallData } from 'starknet';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 import { IStarknetHTLC } from '../starknetHTLC.types';
 
 export declare class StarknetHTLC implements IStarknetHTLC {

package/dist/src/lib/starknet/relay/starknetRelay.d.ts

@@ -1,7 +1,6 @@
 import { AccountInterface } from 'starknet';
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult } from '@catalogfi/utils';
-import { Network, Url } from '@gardenfi/utils';
+import { AsyncResult, Network, Url } from '@gardenfi/utils';
 import { IStarknetHTLC } from '../starknetHTLC.types';
 
 export declare class StarknetRelay implements IStarknetHTLC {

package/dist/src/lib/starknet/starknetHTLC.types.d.ts

@@ -1,5 +1,5 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult } from '@catalogfi/utils';
+import { AsyncResult } from '@gardenfi/utils';
 
 export interface IStarknetHTLC {
     /**

package/dist/src/lib/switchOrAddNetwork.d.ts

@@ -1,7 +1,7 @@
 import { Chain as viemChain } from 'viem/chains';
 import { EvmChain } from '@gardenfi/orderbook';
 import { WalletClient } from 'viem';
-import { AsyncResult } from '@catalogfi/utils';
+import { AsyncResult } from '@gardenfi/utils';
 
 export declare const botanixMainnet: viemChain;
 export declare const hyperliquidTestnet: viemChain;

package/dist/src/lib/utils.d.ts

@@ -1,9 +1,10 @@
-import { BitcoinNetwork, IBaseWallet } from '@catalogfi/wallets';
 import { Environment, Err, Ok } from '@gardenfi/utils';
 import { Chain } from '@gardenfi/orderbook';
 import { Signature } from 'starknet';
 import { Api } from './constants';
 import { ApiConfig } from './garden/garden.types';
+import { BitcoinNetwork } from './bitcoin/provider/provider.interface';
+import { IBaseWallet } from './bitcoin/wallet/baseWallet';
 import { web3 } from '@coral-xyz/anchor';
 
 export declare function resolveApiConfig(env: ApiConfig): {
@@ -32,5 +33,9 @@ export declare const constructOrderPair: (sourceChain: Chain, sourceAsset: strin
 export declare function validateBTCAddress(address: string, networkType: Environment): boolean;
 export declare const getBitcoinNetwork: (network: Environment) => BitcoinNetwork;
 export declare const isHexString: (value: string) => boolean;
-export declare const formatStarknetSignature: (sig: Signature) => Ok<string[]> | Err<string>;
+export declare const formatStarknetSignature: (sig: Signature) => Err<string> | Ok<string[]>;
+export declare function reversify(val: string): Buffer;
+export declare function isErrorWithMessage(err: unknown): err is {
+    message: string;
+};
 export declare const waitForSolanaTxConfirmation: (connection: web3.Connection, txHash: string) => Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -26,16 +26,18 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@catalogfi/utils": "^0.1.6",
-    "@catalogfi/wallets": "^0.2.59",
     "@coral-xyz/anchor": "^0.30.1",
-    "@gardenfi/orderbook": "2.2.1",
-    "@gardenfi/utils": "2.2.1",
+    "@gardenfi/orderbook": "2.3.0",
+    "@gardenfi/utils": "2.3.0",
     "bignumber.js": "^9.1.2",
-    "bitcoinjs-lib": "^6.1.6",
+    "bip32": "^4.0.0",
+    "bip39": "^3.1.0",
+    "bitcoinjs-lib": "^6.1.5",
+    "ecpair": "^2.1.0",
     "starknet": "6.23.1",
     "tiny-secp256k1": "^2.2.3",
-    "varuint-bitcoin": "^1.1.2"
+    "varuint-bitcoin": "^1.1.2",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
     "dotenv": "^16.3.1",