@gardenfi/core 2.0.25 → 2.1.1

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

@@ -1,16 +1,13 @@
 import { ISecretManager } from './../secretManager/secretManager.types';
 import { AsyncResult } from '@catalogfi/utils';
-import { GardenEvents, GardenProps, IGardenJS, SwapParams } from './garden.types';
+import { GardenEvents, IGardenJS, SwapParams, GardenConfigWithHTLCs, GardenConfigWithWallets } from './garden.types';
 import { IOrderbook, MatchedOrder } from '@gardenfi/orderbook';
-import { Environment, EventBroker, IAuth } 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 { DigestKey } from './digestKey/digestKey';
-import { WalletClient } from 'viem';
 import { IStarknetHTLC } from '../starknet/starknetHTLC.types';
-import { Account } from 'starknet';
 
 export declare class Garden extends EventBroker<GardenEvents> implements IGardenJS {
     private environment;
@@ -18,7 +15,6 @@ export declare class Garden extends EventBroker<GardenEvents> implements IGarden
     private _orderbook;
     private _quote;
     private getOrderThreshold;
-    private _orderbookUrl;
     private _auth;
     private orderExecutorCache;
     private _blockNumberFetcher;
@@ -28,16 +24,9 @@ export declare class Garden extends EventBroker<GardenEvents> implements IGarden
     private _btcWallet;
     private bitcoinRedeemCache;
     private _digestKey;
-    constructor(config: GardenProps);
-    static from(config: {
-        environment: Environment;
-        digestKey: string;
-        wallets: {
-            evm: WalletClient;
-            starknet: Account;
-        };
-    }): Garden;
-    get orderbookUrl(): string;
+    private _api;
+    constructor(config: GardenConfigWithHTLCs);
+    static fromWallets(config: GardenConfigWithWallets): Garden;
     get evmHTLC(): IEVMHTLC | undefined;
     get starknetHTLC(): IStarknetHTLC | undefined;
     get quote(): IQuote;

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

@@ -1,14 +1,16 @@
 import { AsyncResult } from '@catalogfi/utils';
 import { Asset, IOrderbook, MatchedOrder } from '@gardenfi/orderbook';
 import { OrderStatus } from '../orderStatus/status';
-import { Environment, EventBroker, IAuth } 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 { IBitcoinWallet } from '@catalogfi/wallets';
 import { IEVMHTLC } from '../evm/htlc.types';
-import { DigestKey } from './digestKey/digestKey';
 import { IStarknetHTLC } from '../starknet/starknetHTLC.types';
+import { AccountInterface } from 'starknet';
+import { WalletClient } from 'viem';
+import { Api } from '../constants';
 
 export type SwapParams = {
     /**
@@ -79,11 +81,6 @@ export interface IGardenJS extends EventBroker<GardenEvents> {
      * @returns {Promise<() => void>} A promise that resolves to a function to cancel the execution.
      */
     execute(): Promise<() => void>;
-    /**
-     * The URL of the orderbook.
-     * @readonly
-     */
-    get orderbookUrl(): string;
     /**
      * The EVM relay.
      * @readonly
@@ -140,19 +137,29 @@ export interface IOrderExecutorCache {
     get(order: MatchedOrder, action: OrderActions): OrderCacheValue | null;
     remove(order: MatchedOrder, action: OrderActions): void;
 }
-export type GardenProps = {
-    environment: Environment;
-    digestKey: string;
-    api?: string;
+export type GardenCoreConfig = {
+    environment: Environment | Api;
+    digestKey: string | DigestKey;
     secretManager?: ISecretManager;
+    auth?: IAuth;
     orderbook?: IOrderbook;
     quote?: IQuote;
     blockNumberFetcher?: IBlockNumberFetcher;
+};
+export type GardenHTLCModules = {
     htlc: {
         evm?: IEVMHTLC;
         starknet?: IStarknetHTLC;
     };
 };
+export type GardenWalletModules = {
+    wallets: {
+        evm?: WalletClient;
+        starknet?: AccountInterface;
+    };
+};
+export type GardenConfigWithWallets = GardenCoreConfig & GardenWalletModules;
+export type GardenConfigWithHTLCs = GardenCoreConfig & GardenHTLCModules;
 /**
  * Actions that can be performed on the order.
  */

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

@@ -1,4 +1,4 @@
-import { Account } from 'starknet';
+import { AccountInterface } from 'starknet';
 import { AsyncResult } from '@catalogfi/utils';
 
-export declare const checkAllowanceAndApprove: (account: Account, tokenAddress: string, htlcAddress: string, amount: bigint, nodeUrl: string) => AsyncResult<string, string>;
+export declare const checkAllowanceAndApprove: (account: AccountInterface, tokenAddress: string, htlcAddress: string, amount: bigint, nodeUrl: string) => AsyncResult<string, string>;

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

@@ -1,4 +1,4 @@
-import { Account } from 'starknet';
+import { AccountInterface } from 'starknet';
 import { MatchedOrder } from '@gardenfi/orderbook';
 import { AsyncResult } from '@catalogfi/utils';
 import { Url } from '@gardenfi/utils';
@@ -8,7 +8,7 @@ export declare class StarknetRelay implements IStarknetHTLC {
     private url;
     private nodeUrl;
     private account;
-    constructor(relayerUrl: string | Url, account: Account, nodeUrl?: string);
+    constructor(relayerUrl: string | Url, account: AccountInterface, nodeUrl?: string);
     get htlcActorAddress(): string;
     initiate(order: MatchedOrder): AsyncResult<string, string>;
     redeem(order: MatchedOrder, secret: string): AsyncResult<string, string>;

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

@@ -3,6 +3,8 @@ import { Chain, EvmChain } from '@gardenfi/orderbook';
 import { WalletClient } from 'viem';
 import { AsyncResult } from '@catalogfi/utils';
 
+export declare const hyperliquidTestnet: viemChain;
+export declare const hyperliquid: viemChain;
 export declare const evmToViemChainMap: Record<EvmChain, viemChain>;
 /**
  * Switches or adds a network to the wallet

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

@@ -12,12 +12,12 @@ export declare function assert(condition: boolean, message: string): void;
 /**
  * concat the leaf version, the length of the script, and the script itself
  */
-export declare function serializeScript(leafScript: Buffer): Buffer;
+export declare function serializeScript(leafScript: Buffer): Buffer<ArrayBuffer>;
 /**
  * concat the length of the script and the script itself
  */
 export declare function prefixScriptLength(s: Buffer): Buffer;
-export declare function sortLeaves(leaf1: Buffer, leaf2: Buffer): Buffer[];
+export declare function sortLeaves(leaf1: Buffer, leaf2: Buffer): Buffer<ArrayBufferLike>[];
 export declare const toXOnly: (pubKey: string) => string;
 export declare const isValidBitcoinPubKey: (pubKey: string) => boolean;
 export declare const constructOrderPair: (sourceChain: Chain, sourceAsset: string, destChain: Chain, destAsset: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "2.0.25",
+  "version": "2.1.1",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,11 +27,10 @@
   },
   "dependencies": {
     "@catalogfi/wallets": "^0.2.59",
-    "@gardenfi/orderbook": "^2.0.9",
-    "@gardenfi/utils": "^2.0.6",
+    "@gardenfi/orderbook": "2.1.1",
+    "@gardenfi/utils": "2.1.1",
     "bignumber.js": "^9.1.2",
     "bitcoinjs-lib": "^6.1.6",
-    "crypto-browserify": "^3.12.1",
     "starknet": "6.23.1",
     "tiny-secp256k1": "^2.2.3",
     "varuint-bitcoin": "^1.1.2",

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

@@ -1,11 +0,0 @@
-export declare class DigestKey {
-    private _digestKey;
-    private _userId;
-    constructor(digestKey: string);
-    static from(digestKey: string): import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<DigestKey, never>;
-    static generateRandom(): import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<DigestKey, never>;
-    private static isValidPrivateKey;
-    private static generateRandomDigestKey;
-    get digestKey(): string;
-    get userId(): string;
-}