@gardenfi/core 2.2.1-beta.1 → 2.2.1

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DyvVJhoD.cjs");exports.API=e.API;exports.BitcoinNetwork=e.BitcoinNetwork;exports.BitcoinProvider=e.BitcoinProvider;exports.BitcoinWallet=e.BitcoinWallet;exports.BlockNumberFetcher=e.BlockNumberFetcher;exports.EvmRelay=e.EvmRelay;exports.Garden=e.Garden;exports.OrderActions=e.OrderActions;exports.OrderStatus=e.OrderStatus;exports.ParseOrderStatus=e.ParseOrderStatus;exports.ParseSwapStatus=e.ParseSwapStatus;exports.Quote=e.Quote;exports.STARKNET_CONFIG=e.STARKNET_CONFIG;exports.SecretManager=e.SecretManager;exports.SolanaHTLC=e.SolanaHTLC;exports.SolanaRelay=e.SolanaRelay;exports.SolanaRelayerAddress=e.SolanaRelayerAddress;exports.StarknetHTLC=e.StarknetHTLC;exports.StarknetRelay=e.StarknetRelay;exports.SwapStatus=e.SwapStatus;exports.botanix=e.botanixMainnet;exports.checkStarknetAlloance=e.checkAllowance;exports.checkStarknetAllowanceAndApprove=e.checkAllowanceAndApprove;exports.constructOrderPair=e.constructOrderPair;exports.evmToViemChainMap=e.evmToViemChainMap;exports.filterDeadlineExpiredOrders=e.filterDeadlineExpiredOrders;exports.hyperliquid=e.hyperliquid;exports.hyperliquidTestnet=e.hyperliquidTestnet;exports.isExpired=e.isExpired;exports.isStarknetAllowanceSufficient=e.isAllowanceSufficient;exports.parseAction=e.parseAction;exports.parseActionFromStatus=e.parseActionFromStatus;exports.resolveApiConfig=e.resolveApiConfig;exports.solanaProgramAddress=e.solanaProgramAddress;exports.switchOrAddNetwork=e.switchOrAddNetwork;exports.toXOnly=e.toXOnly;exports.validateBTCAddress=e.validateBTCAddress;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-lHPQc7tc.cjs");exports.API=e.API;exports.BlockNumberFetcher=e.BlockNumberFetcher;exports.EvmRelay=e.EvmRelay;exports.Garden=e.Garden;exports.OrderActions=e.OrderActions;exports.OrderStatus=e.OrderStatus;exports.ParseOrderStatus=e.ParseOrderStatus;exports.ParseSwapStatus=e.ParseSwapStatus;exports.Quote=e.Quote;exports.STARKNET_CONFIG=e.STARKNET_CONFIG;exports.SecretManager=e.SecretManager;exports.SolanaHTLC=e.SolanaHTLC;exports.SolanaRelay=e.SolanaRelay;exports.SolanaRelayerAddress=e.SolanaRelayerAddress;exports.StarknetHTLC=e.StarknetHTLC;exports.StarknetRelay=e.StarknetRelay;exports.SwapStatus=e.SwapStatus;exports.botanix=e.botanixMainnet;exports.checkStarknetAlloance=e.checkAllowance;exports.checkStarknetAllowanceAndApprove=e.checkAllowanceAndApprove;exports.constructOrderPair=e.constructOrderPair;exports.evmToViemChainMap=e.evmToViemChainMap;exports.filterDeadlineExpiredOrders=e.filterDeadlineExpiredOrders;exports.hyperliquid=e.hyperliquid;exports.hyperliquidTestnet=e.hyperliquidTestnet;exports.isExpired=e.isExpired;exports.isStarknetAllowanceSufficient=e.isAllowanceSufficient;exports.parseAction=e.parseAction;exports.parseActionFromStatus=e.parseActionFromStatus;exports.resolveApiConfig=e.resolveApiConfig;exports.solanaProgramAddress=e.solanaProgramAddress;exports.switchOrAddNetwork=e.switchOrAddNetwork;exports.toXOnly=e.toXOnly;exports.validateBTCAddress=e.validateBTCAddress;

package/dist/index.js

@@ -1,40 +1,37 @@
-import { T as e, M as r, N as t, R as i, m as n, E as o, G as l, O as d, n as c, P as S, q as A, Q as p, U as u, v as k, k as O, j as h, V as m, h as w, S as y, o as T, L as v, y as C, w as P, z as N, F as R, t as f, K as x, J as B, r as E, x as F, p as g, u as q, D as G, W as I, I as L, C as M, A as b } from "./index-D10jIxwi.js";
+import { M as e, m as r, E as t, G as n, O as o, n as i, P as l, q as d, Q as S, N as c, v as A, k as p, j as u, R as k, h as O, S as h, o as m, L as y, y as T, w, z as C, F as v, t as P, K as R, J as f, r as x, x as E, p as N, u as F, D as g, T as q, I as G, C as I, A as L } from "./index-eHNvzW2C.js";
 export {
   e as API,
-  r as BitcoinNetwork,
-  t as BitcoinProvider,
-  i as BitcoinWallet,
-  n as BlockNumberFetcher,
-  o as EvmRelay,
-  l as Garden,
-  d as OrderActions,
-  c as OrderStatus,
-  S as ParseOrderStatus,
-  A as ParseSwapStatus,
-  p as Quote,
-  u as STARKNET_CONFIG,
-  k as SecretManager,
-  O as SolanaHTLC,
-  h as SolanaRelay,
-  m as SolanaRelayerAddress,
-  w as StarknetHTLC,
-  y as StarknetRelay,
-  T as SwapStatus,
-  v as botanix,
-  C as checkStarknetAlloance,
-  P as checkStarknetAllowanceAndApprove,
-  N as constructOrderPair,
-  R as evmToViemChainMap,
-  f as filterDeadlineExpiredOrders,
-  x as hyperliquid,
-  B as hyperliquidTestnet,
-  E as isExpired,
-  F as isStarknetAllowanceSufficient,
-  g as parseAction,
-  q as parseActionFromStatus,
-  G as resolveApiConfig,
-  I as solanaProgramAddress,
-  L as switchOrAddNetwork,
-  M as toXOnly,
-  b as validateBTCAddress
+  r as BlockNumberFetcher,
+  t as EvmRelay,
+  n as Garden,
+  o as OrderActions,
+  i as OrderStatus,
+  l as ParseOrderStatus,
+  d as ParseSwapStatus,
+  S as Quote,
+  c as STARKNET_CONFIG,
+  A as SecretManager,
+  p as SolanaHTLC,
+  u as SolanaRelay,
+  k as SolanaRelayerAddress,
+  O as StarknetHTLC,
+  h as StarknetRelay,
+  m as SwapStatus,
+  y as botanix,
+  T as checkStarknetAlloance,
+  w as checkStarknetAllowanceAndApprove,
+  C as constructOrderPair,
+  v as evmToViemChainMap,
+  P as filterDeadlineExpiredOrders,
+  R as hyperliquid,
+  f as hyperliquidTestnet,
+  x as isExpired,
+  E as isStarknetAllowanceSufficient,
+  N as parseAction,
+  F as parseActionFromStatus,
+  g as resolveApiConfig,
+  q as solanaProgramAddress,
+  G as switchOrAddNetwork,
+  I as toXOnly,
+  L as validateBTCAddress
 };

package/dist/src/index.d.ts

@@ -21,8 +21,4 @@ export { Quote } from './lib/quote/quote';
 export type { IQuote, QuoteResponse, Strategies, } from './lib/quote/quote.types';
 export { constructOrderPair, validateBTCAddress, toXOnly, resolveApiConfig, } from './lib/utils';
 export { evmToViemChainMap, switchOrAddNetwork, hyperliquidTestnet, hyperliquid, botanixMainnet as botanix, } from './lib/switchOrAddNetwork';
-export { BitcoinNetwork } from './lib/bitcoin/provider/provider.interface';
-export { BitcoinProvider } from './lib/bitcoin/provider/provider';
-export { BitcoinWallet } from './lib/bitcoin/wallet/wallet';
-export type { IBitcoinProvider } from './lib/bitcoin/provider/provider.interface';
 export { API, STARKNET_CONFIG, SolanaRelayerAddress, solanaProgramAddress, } from './lib/constants';

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

@@ -1,5 +1,4 @@
-import { IHTLCWallet } from '../htlc.interface';
-import { IBitcoinWallet } from './wallet/wallet.interface';
+import { IBitcoinWallet, IHTLCWallet } from '@catalogfi/wallets';
 
 export declare enum Leaf {
     REFUND = 0,

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

@@ -1,5 +1,6 @@
+import { AsyncResult } from '@catalogfi/utils';
 import { Chain } from '@gardenfi/orderbook';
-import { Environment, AsyncResult } from '@gardenfi/utils';
+import { Environment } 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 '@gardenfi/utils';
-import { OnChainIdentifier } from '../../identifier';
+import { MarkRequired } from '@catalogfi/utils';
+import { OnChainIdentifier } from '@catalogfi/wallets';
 import { Address } from 'viem';
 
 export type AtomicSwapConfig = {

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

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

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

@@ -1,12 +1,13 @@
 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, AsyncResult } from '@gardenfi/utils';
+import { EventBroker, IAuth, DigestKey } 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,15 +1,16 @@
+import { AsyncResult } from '@catalogfi/utils';
 import { AffiliateFeeOptionalChainAsset, Asset, IOrderbook, MatchedOrder } from '@gardenfi/orderbook';
 import { OrderStatus } from '../orderStatus/status';
-import { AsyncResult, Environment, EventBroker, IAuth, DigestKey } from '@gardenfi/utils';
+import { 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';
 
@@ -158,7 +159,7 @@ export type GardenCoreConfig = {
     orderbook?: IOrderbook;
     quote?: IQuote;
     blockNumberFetcher?: IBlockNumberFetcher;
-    btcWallet?: IBitcoinWallet;
+    btcWallet?: BitcoinWallet;
     solanaProgramAddress?: string;
 };
 export type GardenHTLCModules = {

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

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

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

@@ -1,5 +1,6 @@
+import { AsyncResult, Request } from '@catalogfi/utils';
 import { Asset, Chain, CreateOrderRequestWithAdditionalData, CreateOrderReqWithStrategyId } from '@gardenfi/orderbook';
-import { APIResponse, AsyncResult } from '@gardenfi/utils';
+import { APIResponse } from '@gardenfi/utils';
 
 export interface IQuote {
     /**

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

@@ -1,5 +1,5 @@
 import { WalletClient } from 'viem';
-import { Err, EventBroker, Ok } from '@gardenfi/utils';
+import { EventBroker } 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<Err<string> | Ok<string>>;
+    initialize(): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<string, never>>;
     private deriveDigestKeyFromWalletClient;
-    getDigestKey(): Promise<Err<string> | Ok<string>>;
-    generateSecret(nonce: string): Promise<Err<string> | Ok<{
+    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<{
         secret: `0x${string}`;
         secretHash: `0x${string}`;
-    }>>;
+    }, never>>;
     private signMessage;
 }

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

@@ -1,4 +1,5 @@
-import { AsyncResult, EventBroker } from '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/utils';
+import { 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 '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/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 '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/utils';
 
 /**
  * SolanaHTLC is an implementation of ISolanaHTLC that performs atomic swaps directly on-chain.

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

@@ -1,5 +1,6 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { AsyncResult, Url } from '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/utils';
+import { 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 '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/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,6 +1,7 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
+import { AsyncResult } from '@catalogfi/utils';
 import { Account, CallData } from 'starknet';
-import { AsyncResult, Network } from '@gardenfi/utils';
+import { 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,6 +1,7 @@
 import { AccountInterface } from 'starknet';
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { AsyncResult, Network, Url } from '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/utils';
+import { 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 '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/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 '@gardenfi/utils';
+import { AsyncResult } from '@catalogfi/utils';
 
 export declare const botanixMainnet: viemChain;
 export declare const hyperliquidTestnet: viemChain;

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

@@ -1,10 +1,9 @@
+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): {
@@ -33,9 +32,5 @@ 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) => Err<string> | Ok<string[]>;
-export declare function reversify(val: string): Buffer;
-export declare function isErrorWithMessage(err: unknown): err is {
-    message: string;
-};
+export declare const formatStarknetSignature: (sig: Signature) => Ok<string[]> | Err<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-beta.1",
+  "version": "2.2.1",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -26,18 +26,16 @@
     "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-beta.1",
-    "@gardenfi/utils": "2.2.1-beta.1",
+    "@gardenfi/orderbook": "2.2.1",
+    "@gardenfi/utils": "2.2.1",
     "bignumber.js": "^9.1.2",
-    "bip32": "^4.0.0",
-    "bip39": "^3.1.0",
-    "bitcoinjs-lib": "^6.1.5",
-    "ecpair": "^2.1.0",
+    "bitcoinjs-lib": "^6.1.6",
     "starknet": "6.23.1",
     "tiny-secp256k1": "^2.2.3",
-    "varuint-bitcoin": "^1.1.2",
-    "yup": "^1.4.0"
+    "varuint-bitcoin": "^1.1.2"
   },
   "devDependencies": {
     "dotenv": "^16.3.1",