@gardenfi/core 2.3.1-beta.3 → 2.3.1-beta.4

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 one such implementation performs the atomic swaps through a given relayer url.
+ * SolanaRelay is a unified implementation that performs atomic swaps for both SPL and native tokens.
  */
 export declare class SolanaRelay implements ISolanaHTLC {
     private provider;
@@ -13,37 +13,84 @@ 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 SOL.
+     * This PDA stores the swap state (initiator, redeemer, secrethash etc) on-chain and also escrows the tokens/SOL.
      */
     private swapAccount?;
-    private program;
+    private splProgram;
+    private nativeProgram;
     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: string);
+    constructor(provider: AnchorProvider, url: Url, relayer: string, nativeProgramAddress: string, splProgramAddress: string);
     /**
-     * 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
+     * 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;
     /**
-     * Sends a transaction via the relayer.
+     * 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).
      * @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.3.1-beta.3",
+  "version": "2.3.1-beta.4",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,8 +27,9 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
-    "@gardenfi/orderbook": "2.3.1",
-    "@gardenfi/utils": "2.3.1",
+    "@gardenfi/orderbook": "2.3.1-beta.2",
+    "@gardenfi/utils": "2.3.0",
+    "@solana/spl-token": "^0.4.13",
     "bignumber.js": "^9.1.2",
     "bip32": "^4.0.0",
     "bip39": "^3.1.0",