@gardenfi/core 2.1.3-beta.2 → 2.1.3-beta.21

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

@@ -1,4 +1,4 @@
-import { Environment } from '@gardenfi/utils';
+import { Environment, Network } from '@gardenfi/utils';
 
 export type Api = {
     orderbook: string;
@@ -9,3 +9,4 @@ export type Api = {
     starknetRelay: string;
 };
 export declare const API: Record<Environment, Api>;
+export declare const DEFAULT_NODE_URL: Record<Network, string>;

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

@@ -0,0 +1,310 @@
+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";
+}];

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

@@ -10,6 +10,9 @@ 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

@@ -1,4 +1,6 @@
-import { AccountInterface } from 'starknet';
+import { AccountInterface, RpcProvider } 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 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>;
+export declare const isAllowanceSufficient: (accountAddress: string, tokenAddress: string, htlcAddress: string, starknetProvider: RpcProvider, amount: bigint) => AsyncResult<boolean, string>;

package/dist/src/lib/starknet/htlc/starknetHTLC.d.ts

@@ -1,12 +1,13 @@
 import { MatchedOrder } from '@gardenfi/orderbook';
 import { AsyncResult } from '@catalogfi/utils';
 import { Account, CallData } from 'starknet';
+import { Network } from '@gardenfi/utils';
 import { IStarknetHTLC } from '../starknetHTLC.types';
 
 export declare class StarknetHTLC implements IStarknetHTLC {
-    private nodeUrl;
     private account;
-    constructor(account: Account, nodeUrl?: string);
+    private starknetProvider;
+    constructor(account: Account, nodeUrl?: string, network?: Network);
     get htlcActorAddress(): string;
     private getHTLCContract;
     /**

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

@@ -1,16 +1,18 @@
 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);
+    private starknetProvider;
+    constructor(relayerUrl: string | Url, account: AccountInterface, network: Network, nodeUrl?: string);
     get htlcActorAddress(): string;
     initiate(order: MatchedOrder): AsyncResult<string, string>;
+    private approveAndInitiate;
+    private initiateRelay;
     redeem(order: MatchedOrder, secret: string): AsyncResult<string, string>;
     refund(): AsyncResult<string, string>;
 }

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

@@ -1,5 +1,5 @@
 import { Chain as viemChain } from 'viem/chains';
-import { Chain, EvmChain } from '@gardenfi/orderbook';
+import { 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: Chain, walletClient: WalletClient) => AsyncResult<{
+export declare const switchOrAddNetwork: (chain: EvmChain, walletClient: WalletClient) => AsyncResult<{
     message: string;
     walletClient: WalletClient;
 }, string>;

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

@@ -24,4 +24,5 @@ export declare const isValidBitcoinPubKey: (pubKey: string) => boolean;
 export declare const constructOrderPair: (sourceChain: Chain, sourceAsset: string, destChain: Chain, destAsset: string) => string;
 export declare function validateBTCAddress(address: string, networkType: Environment): boolean;
 export declare const getBitcoinNetwork: (network: Environment) => BitcoinNetwork;
-export declare const formatStarknetSignature: (value: Signature) => import('@gardenfi/utils').Result<string[], never> | import('@gardenfi/utils').Result<never, string>;
+export declare const isHexString: (value: string) => boolean;
+export declare const formatStarknetSignature: (sig: Signature) => import('@gardenfi/utils').Result<string[], never> | import('@gardenfi/utils').Result<never, string>;

package/package.json

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