@gardenfi/core 2.5.2-beta.5 → 2.5.3-beta.0

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-s2tkcnpk.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.isOrderExpired=e.isOrderExpired;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-Bx--llHe.cjs");exports.API=e.API;exports.BitcoinNetwork=e.BitcoinNetwork;exports.BitcoinProvider=e.BitcoinProvider;exports.BitcoinWallet=e.BitcoinWallet;exports.BlockNumberFetcher=e.BlockNumberFetcher;exports.DEFAULT_AFFILIATE_ASSET=e.DEFAULT_AFFILIATE_ASSET;exports.EvmRelay=e.EvmRelay;exports.Garden=e.Garden;exports.OrderAction=e.OrderAction;exports.OrderStatus=e.OrderStatus;exports.ParseOrderStatus=e.ParseOrderStatus;exports.Quote=e.Quote;exports.RouteValidator=e.RouteValidator;exports.STARKNET_CONFIG=e.STARKNET_CONFIG;exports.SUI_CONFIG=e.SUI_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.botanixMainnet=e.botanixMainnet;exports.buildRouteMatrix=e.buildRouteMatrix;exports.checkStarknetAlloance=e.checkAllowance;exports.checkStarknetAllowanceAndApprove=e.checkAllowanceAndApprove;exports.constructOrderPair=e.constructOrderPair;exports.evmToViemChainMap=e.evmToViemChainMap;exports.getChainNameFromChainId=e.getChainNameFromChainId;exports.hyperliquid=e.hyperliquid;exports.hyperliquidTestnet=e.hyperliquidTestnet;exports.isCompleted=e.isCompleted;exports.isDeadlinePassed=e.isDeadlinePassed;exports.isStarknetAllowanceSufficient=e.isAllowanceSufficient;exports.parseAction=e.parseAction;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,41 +1,43 @@
-import { U as e, N as r, R as t, T as i, m as n, E as o, G as d, O as l, n as c, P as S, q as A, Q as p, V as u, w as k, k as O, j as h, W as m, h as w, S as y, o as T, M as v, z as C, x as P, A as x, I as E, u as N, L as R, K as f, r as B, t as F, y as g, p as q, v as G, F as I, X as L, J as M, D as b, C as D } from "./index-D-NHDZrP.js";
+import { T as e, L as t, M as r, N as i, m as n, R as o, E as l, G as d, O as c, n as A, P as S, Q as u, Y as k, U as p, V as C, t as T, k as h, j as m, W as O, h as y, S as F, o as I, C as N, Z as R, w as v, u as w, x as P, D as E, F as B, I as L, J as M, q as f, r as g, v as x, p as G, A as _, X as b, K as q, z as D, y as U } from "./index-BsnXI660.js";
 export {
   e as API,
-  r as BitcoinNetwork,
-  t as BitcoinProvider,
+  t as BitcoinNetwork,
+  r as BitcoinProvider,
   i as BitcoinWallet,
   n as BlockNumberFetcher,
-  o as EvmRelay,
+  o as DEFAULT_AFFILIATE_ASSET,
+  l as EvmRelay,
   d as Garden,
-  l as OrderActions,
-  c as OrderStatus,
+  c as OrderAction,
+  A 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,
-  x as constructOrderPair,
+  u as Quote,
+  k as RouteValidator,
+  p as STARKNET_CONFIG,
+  C as SUI_CONFIG,
+  T as SecretManager,
+  h as SolanaHTLC,
+  m as SolanaRelay,
+  O as SolanaRelayerAddress,
+  y as StarknetHTLC,
+  F as StarknetRelay,
+  I as SwapStatus,
+  N as botanixMainnet,
+  R as buildRouteMatrix,
+  v as checkStarknetAlloance,
+  w as checkStarknetAllowanceAndApprove,
+  P as constructOrderPair,
   E as evmToViemChainMap,
-  N as filterDeadlineExpiredOrders,
-  R as hyperliquid,
-  f as hyperliquidTestnet,
-  B as isExpired,
-  F as isOrderExpired,
-  g as isStarknetAllowanceSufficient,
-  q as parseAction,
-  G as parseActionFromStatus,
-  I as resolveApiConfig,
-  L as solanaProgramAddress,
-  M as switchOrAddNetwork,
-  b as toXOnly,
-  D as validateBTCAddress
+  B as getChainNameFromChainId,
+  L as hyperliquid,
+  M as hyperliquidTestnet,
+  f as isCompleted,
+  g as isDeadlinePassed,
+  x as isStarknetAllowanceSufficient,
+  G as parseAction,
+  _ as resolveApiConfig,
+  b as solanaProgramAddress,
+  q as switchOrAddNetwork,
+  D as toXOnly,
+  U as validateBTCAddress
 };

package/dist/src/index.d.ts

@@ -1,8 +1,8 @@
 export { Garden } from './lib/garden/garden';
-export type { IGardenJS, SwapParams, GardenEvents, IOrderExecutorCache, OrderCacheValue, EventCallback, OrderWithStatus, GardenCoreConfig, GardenWalletModules, GardenHTLCModules, GardenConfigWithWallets, GardenConfigWithHTLCs, } from './lib/garden/garden.types';
-export { OrderActions } from './lib/garden/garden.types';
+export type { IGardenJS, SwapParams, GardenEvents, IOrderExecutorCache, OrderCacheValue, EventCallback, OrderWithStatus, GardenCoreConfig, GardenWalletModules, GardenHTLCModules, GardenConfigWithWallets, GardenConfigWithHTLCs, ApiConfig, } from './lib/garden/garden.types';
+export { OrderAction } from './lib/orderStatus/orderStatus';
 export { EvmRelay } from './lib/evm/relay/evmRelay';
-export type { IEVMRelay } from './lib/evm/relay/evmRelay.types';
+export type { IEVMRelay, EVMRelayOpts } from './lib/evm/relay/evmRelay.types';
 export type { IEVMHTLC } from './lib/evm/htlc.types';
 export { StarknetRelay } from './lib/starknet/relay/starknetRelay';
 export type { IStarknetHTLC } from './lib/starknet/starknetHTLC.types';
@@ -13,16 +13,19 @@ export { SolanaHTLC } from './lib/solana/htlc/solanaHTLC';
 export { BlockNumberFetcher } from './lib/blockNumberFetcher/blockNumber';
 export type { IBlockNumberFetcher } from './lib/blockNumberFetcher/blockNumber';
 export { OrderStatus, SwapStatus } from './lib/orderStatus/status';
-export { parseAction, ParseOrderStatus, ParseSwapStatus, isExpired, isOrderExpired, filterDeadlineExpiredOrders, parseActionFromStatus, } from './lib/orderStatus/orderStatusParser';
+export { parseAction, ParseOrderStatus, isCompleted, isDeadlinePassed, } from './lib/orderStatus/orderStatus';
 export { SecretManager } from './lib/secretManager/secretManager';
-export type { ISecretManager, Secret, } from './lib/secretManager/secretManager.types';
+export type { ISecretManager, Secret, SecretManagerEvents, } from './lib/secretManager/secretManager.types';
 export { checkAllowanceAndApprove as checkStarknetAllowanceAndApprove, isAllowanceSufficient as isStarknetAllowanceSufficient, checkAllowance as checkStarknetAlloance, } from './lib/starknet/checkAllowanceAndApprove';
 export { Quote } from './lib/quote/quote';
-export type { IQuote, QuoteResponse, Strategies, QuoteParamsForAssets, QuoteParamsForOrderPair, QuoteOptions, BaseQuoteParams, } from './lib/quote/quote.types';
+export type { StrategiesResponse, BaseQuoteParams, IQuote, QuoteOptions, QuoteParamsForAssets, QuoteParamsForOrderPair, 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 { botanixMainnet, evmToViemChainMap, getChainNameFromChainId, hyperliquid, hyperliquidTestnet, switchOrAddNetwork, } 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';
+export type { UrgencyToFeeRateKey, Urgency, IBitcoinProvider, FeeRates, BitcoinTxType, BitcoinTx, BitcoinUTXO, FeeRateKeys, } from './lib/bitcoin/provider/provider.interface';
+export { DEFAULT_AFFILIATE_ASSET, API, STARKNET_CONFIG, SUI_CONFIG, SolanaRelayerAddress, solanaProgramAddress, } from './lib/constants';
+export type { Api } from './lib/constants';
+export { RouteValidator, buildRouteMatrix, } from './lib/routeValidator/routeValidator';
+export type { RoutePolicy } from './lib/routeValidator/routeValidator';

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

@@ -0,0 +1,107 @@
+import { IBitcoinProvider } from './provider/provider.interface';
+import { IBitcoinWallet } from './wallet/wallet.interface';
+import { IBitcoinHTLC } from './bitcoinhtlc.types';
+import { BitcoinOrderResponse, Order } from '@gardenfi/orderbook';
+import { AsyncResult } from '@gardenfi/utils';
+import * as bitcoin from 'bitcoinjs-lib';
+export declare enum Leaf {
+    REFUND = 0,
+    REDEEM = 1,
+    INSTANT_REFUND = 2
+}
+export type TxType = 'redeem' | 'refund' | 'instantRefund';
+export type LeafScript = {
+    version: number;
+    output: Buffer;
+};
+export type LeafTree = LeafScript | [LeafScript, LeafScript];
+export declare class BitcoinHTLC implements IBitcoinHTLC {
+    /**
+     * Signer of the HTLC can be either the initiator or the redeemer
+     */
+    private signer;
+    private internalPubkey;
+    private network;
+    /**
+     * Note: redeemerAddress and initiatorAddress should be x-only public key without 02 or 03 prefix
+     */
+    constructor(signer: IBitcoinWallet, network: bitcoin.networks.Network);
+    /**
+     * Creates a BitcoinHTLC instance
+     * @param signer Bitcoin wallet of the initiator or redeemer
+     * @returns Promise<BitcoinHTLC> instance
+     *
+     * 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): Promise<BitcoinHTLC>;
+    /**
+     * Generates a taproot address for receiving the funds
+     * @param order The order object
+     * @param type The type of address to generate ('redeem' | 'refund' | 'instantRefund')
+     *   - 'redeem': uses destination_swap parameters (default)
+     *   - 'refund': uses source_swap parameters
+     *   - 'instantRefund': uses source_swap parameters with redeemer
+     */
+    address(order: Order, type: TxType): string;
+    private _buildRawTx;
+    /**
+     * prevout script for the BitcoinHTLC address
+     */
+    private getOutputScript;
+    initiate(order: Order | BitcoinOrderResponse, fee?: number): AsyncResult<string, string>;
+    generateRedeemSACP(order: Order, secret: string, fee?: number): Promise<string>;
+    generateInstantRefundSACP(order: Order): Promise<string>;
+    generateInstantRefundSACPWithHash(hash: string[]): AsyncResult<string[], string>;
+    /**
+     * Instantly refunds the funds to the initiator given the counterparty's signatures and pubkey
+     *
+     * Note: If there are multiple UTXOs being spend, there should be a signature for each UTXO in counterPartySigs
+     */
+    instantRefund(order: Order, counterPartySigs: {
+        utxo: string;
+        sig: string;
+    }[], fee?: number): Promise<string>;
+    /**
+     * Reveals the secret and redeems the HTLC
+     */
+    redeem(order: Order, secret: string, utxoHashes?: string[]): AsyncResult<string, string>;
+    getRedeemHex(order: Order, secret: string, utxoHashes?: string[]): AsyncResult<string, string>;
+    /**
+     * Refunds the funds back to the initiator if the expiry block height + 1 is reached
+     */
+    refund(order: Order, fee?: number): AsyncResult<string, string>;
+    /**
+     * Given a list of UTXOs, checks if the HTLC can be refunded
+     */
+    private canRefund;
+    /**
+     * Given a leaf, generates the control block necessary for spending the leaf
+     */
+    private generateControlBlockFor;
+    /**
+     * Generates the hash of the leaf script
+     * @param leaf Use leaf enum or pass 0 for refund, 1 for redeem, 2 for instant refund
+     * @returns hash of the leaf script
+     */
+    leafHash(leaf: Leaf, order: Order): Buffer;
+    private refundLeaf;
+    private redeemLeaf;
+    private instantRefundLeaf;
+    /**
+     * Generates leaves for a given action type (redeem, refund, instant refund)
+     * @param order The order object
+     * @param type 'redeem' | 'refund' | 'instantRefund'
+     *   - 'redeem': uses destination_swap for all params
+     *   - 'refund': uses source_swap for all params
+     *   - 'instantRefund': uses source_swap, but redeem/instantRefund use .redeemer
+     */
+    private generateLeaves;
+    /**
+     * Generates the merkle proof for the leaf script
+     */
+    private generateMerkleProofFor;
+    getProvider(): Promise<IBitcoinProvider>;
+    getPublicKey(): Promise<string>;
+    htlcActorAddress(): Promise<string>;
+}

package/dist/src/lib/bitcoin/bitcoinhtlc.types.d.ts

@@ -0,0 +1,53 @@
+import { Order } from '@gardenfi/orderbook';
+import { AsyncResult } from '@gardenfi/utils';
+import { IBitcoinProvider } from './provider/provider.interface';
+
+export interface IBitcoinHTLC {
+    /**
+     * Initiates the HTLC by sending funds to the HTLC contract.
+     * @param order - The matched order.
+     * @returns A promise resolving to the transaction hash of the initiation.
+     */
+    initiate(order: Order, fee?: number): AsyncResult<string, string>;
+    /**
+     * Redeems funds from the HTLC contract to the actor's address.
+     * @param order - The matched order.
+     * @param secret - The secret required to unlock the htlc.
+     * @returns A promise resolving to the transaction hash of the redemption.
+     */
+    redeem(order: Order, secret: string): AsyncResult<string, string>;
+    /**
+     * Refunds funds from the HTLC contract back to the actor's address upon expiration.
+     * @param order - The matched order.
+     * @returns A promise resolving to the transaction hash of the refund.
+     */
+    refund(order: Order): AsyncResult<string, string>;
+    /**
+     * Generates the instant refund SACP with the hash of the refund transaction.
+     * @param hash - The hash of the refund transaction.
+     * @returns A promise resolving to the SACP.
+     */
+    generateInstantRefundSACPWithHash(hash: string[]): AsyncResult<string[], string>;
+    /**
+     * Generates the redeem SACP with the secret.
+     * @param order - The matched order.
+     * @param secret - The secret required to unlock the htlc.
+     * @returns A promise resolving to the SACP.
+     */
+    getRedeemHex(order: Order, secret: string, utxoHashes?: string[]): AsyncResult<string, string>;
+    /**
+     * Gets the provider of the wallet.
+     * @returns A promise resolving to the provider.
+     */
+    getProvider(): Promise<IBitcoinProvider>;
+    /**
+     * Gets the public key of the wallet.
+     * @returns A promise resolving to the public key.
+     */
+    getPublicKey(): Promise<string>;
+    /**
+     * Returns the HTLC actor address.
+     * This is the user's wallet address in the case of EVM.
+     */
+    htlcActorAddress(): Promise<string>;
+}

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

@@ -1,5 +1,5 @@
 import { Chain } from '@gardenfi/orderbook';
-import { Environment, AsyncResult } from '@gardenfi/utils';
+import { Network, Url, AsyncResult } from '@gardenfi/utils';
 
 type Response = {
     [key in Chain]: number;
@@ -9,7 +9,7 @@ export interface IBlockNumberFetcher {
 }
 export declare class BlockNumberFetcher implements IBlockNumberFetcher {
     private url;
-    constructor(url: string, network: Environment);
+    constructor(url: Url, network: Network);
     fetchBlockNumbers(): AsyncResult<Response, string>;
 }
 export {};

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

@@ -1,14 +1,11 @@
+import { ChainAsset } from '@gardenfi/orderbook';
 import { Environment, Network } from '@gardenfi/utils';
 
 export type Api = {
-    orderbook: string;
+    baseurl: string;
     auth: string;
-    quote: string;
     info: string;
-    evmRelay: string;
-    starknetRelay: string;
-    solanaRelay: string;
-    suiRelay: string;
+    relayer: string;
 };
 export declare const API: Record<Environment, Api>;
 export declare const STARKNET_CONFIG: Record<Network, {
@@ -31,6 +28,5 @@ export declare const SUI_CONFIG: Record<Network, {
     moduleName: string;
 }>;
 export declare const DEFAULT_AFFILIATE_ASSET: {
-    chain: "base";
-    asset: "0xeae7721d779276eb0f5837e2fe260118724a2ba4";
+    asset: ChainAsset;
 };

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

@@ -1540,7 +1540,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 readonly stateMutability: "view";
                 readonly type: "function";
             }], "refund", readonly [`0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            initiate: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            instantRefund: (args: readonly [`0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -1844,8 +1844,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            initiateWithSignature: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            initiate: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -2149,8 +2149,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            instantRefund: (args: readonly [`0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            initiateWithSignature: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -2454,7 +2454,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
             multicall: (args: readonly [readonly {
                 redeemer: `0x${string}`;
                 expiry: bigint;
@@ -3393,7 +3393,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 readonly stateMutability: "view";
                 readonly type: "function";
             }], "refund", readonly [`0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            initiate: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            instantRefund: (args: readonly [`0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -3697,8 +3697,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            initiateWithSignature: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            initiate: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -4002,8 +4002,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
-            instantRefund: (args: readonly [`0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
+            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            initiateWithSignature: (args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: import('viem').Prettify<import('viem').UnionOmit<import('viem').EstimateContractGasParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -4307,7 +4307,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
+            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined>, "address" | "args" | "abi" | "functionName">>) => Promise<import('viem').EstimateContractGasReturnType>;
             multicall: (args: readonly [readonly {
                 redeemer: `0x${string}`;
                 expiry: bigint;
@@ -5855,7 +5855,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 readonly stateMutability: "view";
                 readonly type: "function";
             }], "refund", readonly [`0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
-            initiate: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
+            instantRefund: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -6159,7 +6159,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
+            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -6463,8 +6463,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
-            initiateWithSignature: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
+            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
+            initiate: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -6768,7 +6768,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
+            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -7072,8 +7072,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
-            instantRefund: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
+            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
+            initiateWithSignature: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options?: Omit<import('viem').SimulateContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -7377,7 +7377,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
+            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, chainOverride, accountOverride>, "address" | "args" | "abi" | "functionName"> | undefined) => Promise<import('viem').SimulateContractReturnType<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -7681,7 +7681,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
+            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride, accountOverride>>;
             multicall: <chainOverride extends import('viem').Chain | undefined = undefined, accountOverride extends import('viem').Account | Address | undefined = undefined>(args: readonly [readonly {
                 redeemer: `0x${string}`;
                 expiry: bigint;
@@ -12722,7 +12722,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 readonly stateMutability: "view";
                 readonly type: "function";
             }], "refund", readonly [`0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
-            initiate: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
+            instantRefund: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -13026,8 +13026,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
-            initiateWithSignature: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
+            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
+            initiate: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -13331,8 +13331,8 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
-            instantRefund: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
+            }], "initiate", readonly [`0x${string}`, bigint, bigint, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
+            initiateWithSignature: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";
                     readonly name: "token_";
@@ -13636,7 +13636,7 @@ export declare class EVMHTLC implements IHTLCWallet {
                 }];
                 readonly stateMutability: "view";
                 readonly type: "function";
-            }], "instantRefund", readonly [`0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
+            }], "initiateWithSignature", readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], import('viem').Chain | undefined, import('viem').Account | undefined, chainOverride>, "address" | "args" | "abi" | "functionName"> extends infer T ? { [K in keyof T]: T[K]; } : never>(args: readonly [`0x${string}`, bigint, bigint, `0x${string}`, `0x${string}`], options: options) => Promise<import('viem').WriteContractReturnType>;
             multicall: <chainOverride extends import('viem').Chain | undefined, options extends import('viem').UnionOmit<import('viem').WriteContractParameters<readonly [{
                 readonly inputs: readonly [{
                     readonly internalType: "address";

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

@@ -1,4 +1,4 @@
-import { MatchedOrder } from '@gardenfi/orderbook';
+import { EvmOrderResponse, Order } from '@gardenfi/orderbook';
 import { AsyncResult } from '@gardenfi/utils';
 
 export interface IEVMHTLC {
@@ -12,18 +12,18 @@ export interface IEVMHTLC {
      * @param order - The matched order.
      * @returns A promise resolving to the transaction hash of the initiation.
      */
-    initiate(order: MatchedOrder): AsyncResult<string, string>;
+    initiate(order: Order | EvmOrderResponse): AsyncResult<string, string>;
     /**
      * Redeems funds from the HTLC contract to the actor's address.
      * @param order - The matched order.
      * @param secret - The secret required to unlock the htlc.
      * @returns A promise resolving to the transaction hash of the redemption.
      */
-    redeem(order: MatchedOrder, secret: string): AsyncResult<string, string>;
+    redeem(order: Order, secret: string): AsyncResult<string, string>;
     /**
      * Refunds funds from the HTLC contract back to the actor's address upon expiration.
      * @param order - The matched order.
      * @returns A promise resolving to the transaction hash of the refund.
      */
-    refund(order: MatchedOrder): AsyncResult<string, string>;
+    refund(order: Order): AsyncResult<string, string>;
 }

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

@@ -1,6 +1,6 @@
 import { AsyncResult, IAuth, Url } from '@gardenfi/utils';
 import { WalletClient } from 'viem';
-import { MatchedOrder } from '@gardenfi/orderbook';
+import { EvmOrderResponse, Order } from '@gardenfi/orderbook';
 import { IEVMHTLC } from '../htlc.types';
 
 export declare class EvmRelay implements IEVMHTLC {
@@ -9,10 +9,11 @@ export declare class EvmRelay implements IEVMHTLC {
     private wallet;
     constructor(url: string | Url, wallet: WalletClient, auth: IAuth);
     get htlcActorAddress(): string;
-    initiate(order: MatchedOrder): AsyncResult<string, string>;
-    private getTokenAddress;
+    initiate(order: Order | EvmOrderResponse): AsyncResult<string, string>;
     private _initiateOnNativeHTLC;
     private _initiateOnErc20HTLC;
-    redeem(order: MatchedOrder, secret: string): AsyncResult<string, string>;
+    executeApprovalTransaction(order: EvmOrderResponse): AsyncResult<string, string>;
+    private initiateWithCreateOrderResponse;
+    redeem(order: Order, secret: string): AsyncResult<string, string>;
     refund(): AsyncResult<string, string>;
 }

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

@@ -1,4 +1,4 @@
-import { MatchedOrder } from '@gardenfi/orderbook';
+import { Order } from '@gardenfi/orderbook';
 import { AsyncResult, IStore } from '@gardenfi/utils';
 import { WalletClient } from 'viem';
 
@@ -15,7 +15,7 @@ export interface IEVMRelay {
      * @NOTE send the current block number of the L1 chain, if the order is on L2 chain (arbitrum).
      * @returns txHash of Initiation
      */
-    init(walletClient: WalletClient, order: MatchedOrder): AsyncResult<string, string>;
+    init(walletClient: WalletClient, order: Order): AsyncResult<string, string>;
     /**
      * Redeems funds from the EVM atomic swap contract using relay service.
      * Sends the secret to the relay service.