@gardenfi/core 0.2.0-beta.21 → 0.2.0-beta.23

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

@@ -26,6 +26,7 @@ export declare class GardenHTLC implements IHTLCWallet {
     private internalPubkey;
     private network;
     private initiateAmount;
+    private utxoHashes?;
     /**
      * Note: redeemerAddress and initiatorAddress should be x-only public key without 02 or 03 prefix
      */
@@ -43,7 +44,7 @@ export declare class GardenHTLC implements IHTLCWallet {
      * Note: When the signer is the initiator, only refund and instant refund can be done
      * When the signer is the redeemer, only redeem can be done
      */
-    static from(signer: IBitcoinWallet, initiateAmount: number, secretHash: string, initiatorPubkey: string, redeemerPubkey: string, expiry: number): Promise<GardenHTLC>;
+    static from(signer: IBitcoinWallet, initiateAmount: number, secretHash: string, initiatorPubkey: string, redeemerPubkey: string, expiry: number, utxoHashes?: string[]): Promise<GardenHTLC>;
     /**
      * Generates a taproot address for receiving the funds
      */

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

@@ -20,6 +20,7 @@ export declare class Garden implements IGardenJS {
     private wallets;
     private evmAddress;
     private store;
+    private orderExecutorCache;
     constructor(config: {
         orderbookURl: string;
         secretManager: ISecretManager;
@@ -40,6 +41,9 @@ export declare class Garden implements IGardenJS {
     private pollOrder;
     private emit;
     execute(interval?: number): Promise<() => void>;
+    private evmRedeem;
+    private btcRedeem;
+    private btcRefund;
     private getWallet;
     on<E extends keyof GardenEvents>(event: E, cb: GardenEvents[E]): void;
     off<E extends keyof GardenEvents>(event: E, cb: GardenEvents[E]): void;

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

@@ -48,6 +48,7 @@ export type GardenEvents = {
     error: (order: MatchedOrder, error: string) => void;
     success: (order: MatchedOrder, action: OrderActions, result: string) => void;
     onPendingOrdersChanged: (orders: MatchedOrder[]) => void;
+    log: (id: string, message: string) => void;
 };
 export type EventCallback = (...args: any[]) => void;
 export interface IGardenJS {
@@ -68,12 +69,12 @@ export interface IGardenJS {
 export type OrderCacheValue = {
     txHash: string;
     timeStamp: number;
+    btcRedeemUTXO?: string;
 };
 export interface IOrderCache {
-    getOrder(): MatchedOrder;
-    set(action: OrderActions, txHash: string): void;
-    get(action: OrderActions): OrderCacheValue | null;
-    remove(action: OrderActions): void;
+    set(order: MatchedOrder, action: OrderActions, txHash: string, utxo?: string): void;
+    get(order: MatchedOrder, action: OrderActions): OrderCacheValue | null;
+    remove(order: MatchedOrder, action: OrderActions): void;
 }
 /**
  * Actions that can be performed on the order.

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

@@ -1,13 +1,9 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
-import { IStore } from '@gardenfi/utils';
 import { IOrderCache, OrderActions, OrderCacheValue } from './garden.types';
 
 export declare class OrderCache implements IOrderCache {
-    private order;
-    private store;
-    constructor(order: MatchedOrder, store: IStore);
-    getOrder(): MatchedOrder;
-    set(action: OrderActions, txHash: string): void;
-    get(action: OrderActions): OrderCacheValue | null;
-    remove(action: OrderActions): void;
+    private cache;
+    set(order: MatchedOrder, action: OrderActions, txHash: string, utxo?: string): void;
+    get(order: MatchedOrder, action: OrderActions): OrderCacheValue | null;
+    remove(order: MatchedOrder, action: OrderActions): void;
 }

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

@@ -26,3 +26,4 @@ export declare const ParseSwapStatus: (swap: Swap, currentBlockNumber: number) =
  * @returns {OrderActions} The action to be performed on the order
  */
 export declare const parseAction: (order: MatchedOrder, sourceChainCurrentBlockNumber: number, destChainCurrentBlockNumber: number) => OrderActions;
+export declare const isExpired: (unixTime: number, tillHours?: number) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "0.2.0-beta.21",
+  "version": "0.2.0-beta.23",
   "type": "module",
   "files": [
     "dist"
@@ -28,7 +28,7 @@
   "dependencies": {
     "@catalogfi/utils": "^0.1.6",
     "@catalogfi/wallets": "^0.2.50",
-    "@gardenfi/orderbook": "^0.2.0-beta.10",
+    "@gardenfi/orderbook": "^0.2.0-beta.11",
     "@gardenfi/utils": "^0.0.1-beta.17",
     "bitcoinjs-lib": "^6.1.6",
     "tiny-secp256k1": "^2.2.3",