@gardenfi/core 2.5.3-beta.0 → 2.5.3-beta.2

package/dist/src/lib/solana/relayer/solanaRelay.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { AsyncResult, IAuth, Url } from '@gardenfi/utils';
+import { AsyncResult, IAuth, Url, Network } from '@gardenfi/utils';
 import { ISolanaHTLC } from '../htlc/ISolanaHTLC';
 import { Order, SolanaOrderResponse } from '@gardenfi/orderbook';
 
@@ -18,27 +18,40 @@ export declare class SolanaRelay implements ISolanaHTLC {
     private splProgram?;
     private nativeProgram?;
     private relayer;
-    private orderbook;
     private auth;
     /**
      * Creates a new instance of SolanaRelay.
      * @param {AnchorProvider} provider - An abstraction of RPC connection and a Wallet
      * @param {Url} endpoint - API endpoint of the relayer node
-     * @param {string} relayer - On-chain address of the relayer in base58 format
-     * @param {string} splProgramAddress - On-chain address of the SPL token swap program
-     * @param {string} nativeProgramAddress - On-chain address of the native token swap program
+     * @param {Network} network - Chain network for selecting default relayer and program addresses
+     * @param {IAuth} auth - Auth provider for relayer endpoints
+     * @param {object} [overrides] - Optional overrides for relayer/program addresses
+     * @param {string} [overrides.relayer] - Custom relayer address (base58)
+     * @param {{native?: string; spl?: string}} [overrides.programAddress] - Custom program addresses
      * @throws {Error} If any required parameters are missing or invalid
      */
-    constructor(provider: AnchorProvider, url: Url, relayer: string, programAddress: {
-        native?: string;
-        spl?: string;
-    }, auth: IAuth);
+    constructor(provider: AnchorProvider, url: Url, network: Network, auth: IAuth, overrides?: {
+        relayer?: string;
+        programAddress?: {
+            native?: string;
+            spl?: string;
+        };
+    });
     /**
      * Gets the on-chain address of the current user's wallet.
      * @returns {string} The wallet's on-chain address in base58 format
      * @throws {Error} If no provider public key is found
      */
     get htlcActorAddress(): string;
+    /**
+     * Initiates a swap by creating a new swap account and locking funds.
+     * Automatically detects whether to use SPL or native token handling.
+     * @param {Order} order - The matched order containing swap details
+     * @returns {Promise<AsyncResult<string, string>>} A promise that resolves to either:
+     *   - Ok with the transaction ID on success
+     *   - Err with an error message on failure
+     */
+    initiate(order: Order | SolanaOrderResponse): AsyncResult<string, string>;
     /**
      * Sends a transaction via the relayer for SPL tokens.
      * @param {web3.Transaction} transaction - The transaction to send
@@ -77,15 +90,7 @@ export declare class SolanaRelay implements ISolanaHTLC {
      * @private
      */
     private initiateNativeSwap;
-    /**
-     * Initiates a swap by creating a new swap account and locking funds.
-     * Automatically detects whether to use SPL or native token handling.
-     * @param {Order} order - The matched order containing swap details
-     * @returns {Promise<AsyncResult<string, string>>} A promise that resolves to either:
-     *   - Ok with the transaction ID on success
-     *   - Err with an error message on failure
-     */
-    initiate(order: Order | SolanaOrderResponse): AsyncResult<string, string>;
+    private initiateWithCreateOrderResponse;
     /**
      * Redeems a swap by providing the secret.
      * @param {Order} order - Matched order object containing swap details
@@ -95,7 +100,6 @@ export declare class SolanaRelay implements ISolanaHTLC {
      *   - Err with an error message on failure
      */
     redeem(order: Order, secret: string): AsyncResult<string, string>;
-    private initiateWithCreateOrderResponse;
     /**
      * DO NOT CALL THIS FUNCTION. Refund is automatically taken care of by the relayer!
      * This method exists only to satisfy the ISolanaHTLC interface but is not intended for direct use.

package/dist/src/lib/sui/relay/suiRelay.d.ts

@@ -12,7 +12,7 @@ export declare class SuiRelay implements ISuiHTLC {
     constructor(relayerUrl: string | Url, account: WalletWithRequiredFeatures | Ed25519Keypair, network: Network);
     get htlcActorAddress(): string;
     initiate(order: Order | SuiOrderResponse): AsyncResult<string, string>;
-    redeem(order: Order, secret: string): AsyncResult<string, string>;
     private initiateWithCreateOrderResponse;
+    redeem(order: Order, secret: string): AsyncResult<string, string>;
     refund(): AsyncResult<string, string>;
 }

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

@@ -1,20 +1,20 @@
 import { Chain as viemChain } from 'viem/chains';
-import { EvmChain } from '@gardenfi/orderbook';
+import { EVMChains } from '@gardenfi/orderbook';
 import { WalletClient } from 'viem';
 import { AsyncResult } from '@gardenfi/utils';
 
 export declare const botanixMainnet: viemChain;
 export declare const hyperliquidTestnet: viemChain;
 export declare const hyperliquid: viemChain;
-export declare const evmToViemChainMap: Record<EvmChain, viemChain>;
-export declare const getChainNameFromChainId: (chainId: number) => EvmChain | null;
+export declare const evmToViemChainMap: Record<EVMChains, viemChain>;
+export declare const getChainNameFromChainId: (chainId: number) => EVMChains | null;
 /**
  * Switches or adds a network to the wallet
  * @param chain Garden supported chain
  * @param walletClient
  * @returns new walletClient with updated chain
  */
-export declare const switchOrAddNetwork: (chain: EvmChain, walletClient: WalletClient) => AsyncResult<{
+export declare const switchOrAddNetwork: (chain: EVMChains, walletClient: WalletClient) => AsyncResult<{
     message: string;
     walletClient: WalletClient;
 }, string>;

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

@@ -7,12 +7,13 @@ import { BitcoinNetwork } from './bitcoin/provider/provider.interface';
 import { IBaseWallet } from './bitcoin/wallet/baseWallet';
 import { web3 } from '@coral-xyz/anchor';
 
+import * as bitcoin from 'bitcoinjs-lib';
 export declare function resolveApiConfig(env: ApiConfig): {
     api: Api;
     network: Network;
 };
 export declare const computeSecret: (fromChain: Chain, toChain: Chain, wallets: Partial<Record<Chain, IBaseWallet>>, nonce: number) => Promise<string>;
-export declare const isFromChainBitcoin: (chain: Chain) => chain is "bitcoin" | "bitcoin_testnet" | "bitcoin_regtest";
+export declare const isFromChainBitcoin: (chain: Chain) => chain is "bitcoin_regtest" | "bitcoin_testnet" | "bitcoin";
 /**
  * Given a hex string or a buffer, return the x-only pubkey. (removes y coordinate the prefix)
  */
@@ -33,6 +34,7 @@ export declare const constructOrderPair: (sourceChain: Chain, sourceAsset: strin
 export declare function validateBTCAddress(address: string, networkType: Environment): boolean;
 export declare function generateOutputs(output: Buffer, count: number): Buffer[];
 export declare const getBitcoinNetworkFromEnvironment: (network: Network) => BitcoinNetwork;
+export declare const getBitcoinNetworkFromNetwork: (network: Network) => bitcoin.networks.Network;
 export declare const isHexString: (value: string) => boolean;
 export declare const formatStarknetSignature: (sig: Signature) => Err<string> | Ok<string[]>;
 export declare function reversify(val: string): Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "2.5.3-beta.0",
+  "version": "2.5.3-beta.2",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@gardenfi/orderbook": "workspace:*",
-    "@gardenfi/utils": "workspace:*",
+    "@gardenfi/orderbook": "2.5.3-beta.3",
+    "@gardenfi/utils": "2.5.3-beta.2",
     "@mysten/signers": "^0.3.4",
     "@mysten/sui": "^1.37.1",
     "@mysten/wallet-standard": "^0.16.9",
@@ -53,4 +53,4 @@
     "vitest": "^1.6.0"
   },
   "sideEffects": false
-}
+}