@gardenfi/core 2.4.3-beta.5 → 2.4.3-beta.7

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DkssHOBr.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-DpRp0W1D.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;

package/dist/index.js

@@ -1,4 +1,4 @@
-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-DFY2Tld-.js";
+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-BcHwWFv2.js";
 export {
   e as API,
   r as BitcoinNetwork,

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

@@ -16,14 +16,8 @@ export declare const STARKNET_CONFIG: Record<Network, {
 }>;
 export declare const SolanaRelayerAddress: Record<Network, string>;
 export declare const solanaProgramAddress: {
-    mainnet: {
-        native: string;
-        spl: string;
-    };
-    staging: {
-        native: string;
-        spl: string;
-    };
+    mainnet: string;
+    staging: string;
 };
 export declare const DEFAULT_AFFILIATE_ASSET: {
     chain: "base";

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

@@ -159,10 +159,7 @@ export type GardenCoreConfig = {
     quote?: IQuote;
     blockNumberFetcher?: IBlockNumberFetcher;
     btcWallet?: IBitcoinWallet;
-    solanaProgramAddress?: {
-        native?: string;
-        spl?: string;
-    };
+    solanaProgramAddress?: string;
 };
 export type GardenHTLCModules = {
     htlc: {

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

@@ -5,7 +5,7 @@ import { MatchedOrder } from '@gardenfi/orderbook';
 
 /**
  * A Relay is an endpoint that submits the transaction on-chain on one's behalf, paying any fees.
- * SolanaRelay is a unified implementation that performs atomic swaps for both SPL and native tokens.
+ * SolanaRelay is one such implementation performs the atomic swaps through a given relayer url.
  */
 export declare class SolanaRelay implements ISolanaHTLC {
     private provider;
@@ -13,86 +13,37 @@ export declare class SolanaRelay implements ISolanaHTLC {
     /**
      * The on-chain Program Derived Address (PDA) that facilitates this swap.
      * A PDA represents an on-chain memory space. It can store SOL too and is owned by a program (that derived it).
-     * This PDA stores the swap state (initiator, redeemer, secrethash etc) on-chain and also escrows the tokens/SOL.
+     * This PDA stores the swap state (initiator, redeemer, secrethash etc) on-chain and also escrows the SOL.
      */
-    private splProgram?;
-    private nativeProgram?;
+    private swapAccount?;
+    private program;
     private relayer;
     /**
      * 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
      * @throws {Error} If any required parameters are missing or invalid
      */
-    constructor(provider: AnchorProvider, url: Url, relayer: string, programAddress: {
-        native?: string;
-        spl?: string;
-    });
+    constructor(provider: AnchorProvider, url: Url, relayer: string, programAddress: 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
+     * Gets the on-chain address of the atomic swap program.
+     * @returns {string} The program's on-chain address in base58 format
+     * @throws {Error} If no program ID is found
      */
     get htlcActorAddress(): string;
     /**
-     * Determines if the given order is for a native Solana token (SOL).
-     * @param {MatchedOrder} order - The matched order to check
-     * @returns {boolean} True if it's a native token, false if it's an SPL token
-     * @private
-     */
-    private isNativeToken;
-    /**
-     * Sends a transaction via the relayer for SPL tokens.
-     * @param {web3.Transaction} transaction - The transaction to send
-     * @param {string} orderId - The order ID for tracking
-     * @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
-     * @private
-     */
-    private sendSplViaRelayer;
-    /**
-     * Initiates a swap directly via HTLC (without relayer).
+     * Sends a transaction via the relayer.
      * @param {web3.Transaction} transaction - The transaction to send
-     * @param {MatchedOrder} order - The matched order
      * @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
      * @private
      */
+    private sendViaRelayer;
     private initiateViaHTLC;
-    /**
-     * Creates a PDA (Program Derived Address) for the swap account.
-     * @param {Buffer} secretHash - The secret hash buffer
-     * @param {web3.PublicKey} programId - The program ID to use for PDA derivation
-     * @returns {web3.PublicKey} The derived PDA
-     * @private
-     */
-    private createSwapPDA;
-    /**
-     * Initiates a swap for SPL tokens.
-     * @param {MatchedOrder} 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
-     * @private
-     */
-    private initiateSplSwap;
-    /**
-     * Initiates a swap for native tokens (SOL).
-     * @param {MatchedOrder} 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
-     * @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 {MatchedOrder} 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/core",
-  "version": "2.4.3-beta.5",
+  "version": "2.4.3-beta.7",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,9 +27,8 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
-    "@gardenfi/orderbook": "2.4.3-beta.4",
-    "@gardenfi/utils": "2.4.2",
-    "@solana/spl-token": "^0.4.13",
+    "@gardenfi/orderbook": "2.4.3-beta.6",
+    "@gardenfi/utils": "2.4.3",
     "bignumber.js": "^9.1.2",
     "bip32": "^4.0.0",
     "bip39": "^3.1.0",