@gardenfi/core 2.4.6-beta.7 → 2.4.6-beta.8

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

@@ -8,7 +8,6 @@ import { IEVMHTLC } from '../evm/htlc.types';
 import { IStarknetHTLC } from '../starknet/starknetHTLC.types';
 import { IBitcoinWallet } from '../bitcoin/wallet/wallet.interface';
 import { ISolanaHTLC } from '../solana/htlc/ISolanaHTLC';
-import { ISuiHTLC } from '../sui/suiHTLC.types';
 
 export declare class Garden extends EventBroker<GardenEvents> implements IGardenJS {
     private environment;
@@ -23,7 +22,6 @@ export declare class Garden extends EventBroker<GardenEvents> implements IGarden
     private _evmHTLC;
     private _starknetHTLC;
     private _solanaHTLC;
-    private _suiHTLC;
     private _btcWallet;
     private bitcoinRedeemCache;
     private _digestKey;
@@ -35,7 +33,6 @@ export declare class Garden extends EventBroker<GardenEvents> implements IGarden
     get evmHTLC(): IEVMHTLC | undefined;
     get starknetHTLC(): IStarknetHTLC | undefined;
     get solanaHTLC(): ISolanaHTLC | undefined;
-    get suiHTLC(): ISuiHTLC | undefined;
     get quote(): IQuote;
     get btcWallet(): IBitcoinWallet | undefined;
     get orderbook(): IOrderbook;
@@ -56,7 +53,6 @@ export declare class Garden extends EventBroker<GardenEvents> implements IGarden
     private validateAmount;
     execute(interval?: number): Promise<() => void>;
     private solRedeem;
-    private suiRedeem;
     private evmRedeem;
     private starknetRedeem;
     private btcRedeem;

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

@@ -12,8 +12,6 @@ import { Api } from '../constants';
 import { IBitcoinWallet } from '../bitcoin/wallet/wallet.interface';
 import { ISolanaHTLC } from '../solana/htlc/ISolanaHTLC';
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { ISuiHTLC } from '../sui/suiHTLC.types';
-import { WalletWithRequiredFeatures } from '@mysten/wallet-standard';
 
 export type SwapParams = {
     /**
@@ -103,11 +101,6 @@ export interface IGardenJS extends EventBroker<GardenEvents> {
      * @readonly
      */
     get solanaHTLC(): ISolanaHTLC | undefined;
-    /**
-     * The Sui relay.
-     * @readonly
-     */
-    get suiHTLC(): ISuiHTLC | undefined;
     /**
      * The current quote.
      * @readonly
@@ -166,17 +159,13 @@ export type GardenCoreConfig = {
     quote?: IQuote;
     blockNumberFetcher?: IBlockNumberFetcher;
     btcWallet?: IBitcoinWallet;
-    solanaProgramAddress?: {
-        native?: string;
-        spl?: string;
-    };
+    solanaProgramAddress?: string;
 };
 export type GardenHTLCModules = {
     htlc: {
         evm?: IEVMHTLC;
         starknet?: IStarknetHTLC;
         solana?: ISolanaHTLC;
-        sui?: ISuiHTLC;
     };
 };
 export type GardenWalletModules = {
@@ -184,7 +173,6 @@ export type GardenWalletModules = {
         evm?: WalletClient;
         starknet?: AccountInterface;
         solana?: AnchorProvider;
-        sui?: WalletWithRequiredFeatures;
     };
 };
 export type GardenConfigWithWallets = GardenCoreConfig & GardenWalletModules;

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.6-beta.7",
+  "version": "2.4.6-beta.8",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -28,12 +28,8 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@gardenfi/orderbook": "2.4.6-beta.7",
+    "@gardenfi/orderbook": "2.4.6",
     "@gardenfi/utils": "2.4.6",
-    "@mysten/signers": "^0.3.4",
-    "@mysten/sui": "^1.37.1",
-    "@mysten/wallet-standard": "^0.16.9",
-    "@solana/spl-token": "^0.4.13",
     "bignumber.js": "^9.1.2",
     "bip32": "^4.0.0",
     "bip39": "^3.1.0",