@gardenfi/core 2.1.3-beta.6 → 2.1.3-beta.8

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

@@ -10,9 +10,6 @@ export declare class EvmRelay implements IEVMHTLC {
     constructor(url: string | Url, wallet: WalletClient, auth: IAuth);
     get htlcActorAddress(): string;
     initiate(order: MatchedOrder): AsyncResult<string, string>;
-    private getTokenAddress;
-    private _initiateOnNativeHTLC;
-    private _initiateOnErc20HTLC;
     redeem(order: MatchedOrder, secret: string): AsyncResult<string, string>;
     refund(): AsyncResult<string, string>;
 }

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

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

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

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

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

@@ -1,5 +1,5 @@
 import { Chain as viemChain } from 'viem/chains';
-import { EvmChain } from '@gardenfi/orderbook';
+import { Chain, EvmChain } from '@gardenfi/orderbook';
 import { WalletClient } from 'viem';
 import { AsyncResult } from '@catalogfi/utils';
 
@@ -12,7 +12,7 @@ export declare const evmToViemChainMap: Record<EvmChain, viemChain>;
  * @param walletClient
  * @returns new walletClient with updated chain
  */
-export declare const switchOrAddNetwork: (chain: EvmChain, walletClient: WalletClient) => AsyncResult<{
+export declare const switchOrAddNetwork: (chain: Chain, walletClient: WalletClient) => AsyncResult<{
     message: string;
     walletClient: WalletClient;
 }, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "2.1.3-beta.6",
+  "version": "2.1.3-beta.8",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@catalogfi/wallets": "^0.2.59",
-    "@gardenfi/orderbook": "2.1.2-beta.1",
+    "@gardenfi/orderbook": "2.1.2",
     "@gardenfi/utils": "2.1.2",
     "bignumber.js": "^9.1.2",
     "bitcoinjs-lib": "^6.1.6",

package/dist/src/lib/evm/abi/nativeHTLC.d.ts

@@ -1,310 +0,0 @@
-export declare const nativeHTLCAbi: readonly [{
-    readonly inputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "name";
-        readonly type: "string";
-    }, {
-        readonly internalType: "string";
-        readonly name: "version";
-        readonly type: "string";
-    }];
-    readonly stateMutability: "nonpayable";
-    readonly type: "constructor";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "InvalidShortString";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__DuplicateOrder";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__IncorrectFundsRecieved";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__IncorrectSecret";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__InsufficientBalance";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__InvalidRedeemerSignature";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__OrderFulfilled";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__OrderNotExpired";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__OrderNotInitiated";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__SameInitiatorAndRedeemer";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__ZeroAddressInitiator";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__ZeroAddressRedeemer";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__ZeroAmount";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NativeHTLC__ZeroTimelock";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "string";
-        readonly name: "str";
-        readonly type: "string";
-    }];
-    readonly name: "StringTooLong";
-    readonly type: "error";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [];
-    readonly name: "EIP712DomainChanged";
-    readonly type: "event";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "bytes32";
-        readonly name: "secretHash";
-        readonly type: "bytes32";
-    }, {
-        readonly indexed: false;
-        readonly internalType: "uint256";
-        readonly name: "amount";
-        readonly type: "uint256";
-    }];
-    readonly name: "Initiated";
-    readonly type: "event";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "bytes32";
-        readonly name: "secretHash";
-        readonly type: "bytes32";
-    }, {
-        readonly indexed: false;
-        readonly internalType: "bytes";
-        readonly name: "secret";
-        readonly type: "bytes";
-    }];
-    readonly name: "Redeemed";
-    readonly type: "event";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }];
-    readonly name: "Refunded";
-    readonly type: "event";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "eip712Domain";
-    readonly outputs: readonly [{
-        readonly internalType: "bytes1";
-        readonly name: "fields";
-        readonly type: "bytes1";
-    }, {
-        readonly internalType: "string";
-        readonly name: "name";
-        readonly type: "string";
-    }, {
-        readonly internalType: "string";
-        readonly name: "version";
-        readonly type: "string";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "chainId";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "address";
-        readonly name: "verifyingContract";
-        readonly type: "address";
-    }, {
-        readonly internalType: "bytes32";
-        readonly name: "salt";
-        readonly type: "bytes32";
-    }, {
-        readonly internalType: "uint256[]";
-        readonly name: "extensions";
-        readonly type: "uint256[]";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address payable";
-        readonly name: "redeemer";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "timelock";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "amount";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "bytes32";
-        readonly name: "secretHash";
-        readonly type: "bytes32";
-    }];
-    readonly name: "initiate";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address payable";
-        readonly name: "initiator";
-        readonly type: "address";
-    }, {
-        readonly internalType: "address payable";
-        readonly name: "redeemer";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "timelock";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "amount";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "bytes32";
-        readonly name: "secretHash";
-        readonly type: "bytes32";
-    }];
-    readonly name: "initiateOnBehalf";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }, {
-        readonly internalType: "bytes";
-        readonly name: "signature";
-        readonly type: "bytes";
-    }];
-    readonly name: "instantRefund";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }];
-    readonly name: "instantRefundDigest";
-    readonly outputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "";
-        readonly type: "bytes32";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "";
-        readonly type: "bytes32";
-    }];
-    readonly name: "orders";
-    readonly outputs: readonly [{
-        readonly internalType: "bool";
-        readonly name: "isFulfilled";
-        readonly type: "bool";
-    }, {
-        readonly internalType: "address payable";
-        readonly name: "initiator";
-        readonly type: "address";
-    }, {
-        readonly internalType: "address payable";
-        readonly name: "redeemer";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "initiatedAt";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "timelock";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "amount";
-        readonly type: "uint256";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }, {
-        readonly internalType: "bytes";
-        readonly name: "secret";
-        readonly type: "bytes";
-    }];
-    readonly name: "redeem";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "orderID";
-        readonly type: "bytes32";
-    }];
-    readonly name: "refund";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "token";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}];