@atomiqlabs/chain-solana 11.0.0 → 12.0.0

package/dist/solana/SolanaChainType.d.ts

@@ -7,4 +7,5 @@ import { SolanaSwapData } from "./swaps/SolanaSwapData";
 import { SolanaChainEventsBrowser } from "./events/SolanaChainEventsBrowser";
 import { SolanaBtcRelay } from "./btcrelay/SolanaBtcRelay";
 import { SolanaChainInterface } from "./chain/SolanaChainInterface";
-export type SolanaChainType = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SolanaSigner, SolanaSwapData, SolanaSwapProgram, SolanaChainInterface, SolanaChainEventsBrowser, SolanaBtcRelay<any>, never, never, never>;
+import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
+export type SolanaChainType = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SolanaSigner, Wallet, SolanaSwapData, SolanaSwapProgram, SolanaChainInterface, SolanaChainEventsBrowser, SolanaBtcRelay<any>, never, never, never>;

package/dist/solana/chain/SolanaChainInterface.d.ts

@@ -10,13 +10,14 @@ import { SolanaEvents } from "./modules/SolanaEvents";
 import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
 import { SolanaSigner } from "../wallet/SolanaSigner";
 import { Buffer } from "buffer";
+import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
 export type SolanaRetryPolicy = {
     maxRetries?: number;
     delay?: number;
     exponential?: boolean;
     transactionResendInterval?: number;
 };
-export declare class SolanaChainInterface implements ChainInterface<SolanaTx, SolanaSigner, "SOLANA"> {
+export declare class SolanaChainInterface implements ChainInterface<SolanaTx, SolanaSigner, "SOLANA", Wallet> {
     readonly chainId = "SOLANA";
     readonly SLOT_TIME = 400;
     readonly TX_SLOT_VALIDITY = 151;
@@ -38,6 +39,7 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, So
     constructor(connection: Connection, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
     getBalance(signer: string, tokenAddress: string): Promise<bigint>;
     isValidAddress(address: string): boolean;
+    normalizeAddress(address: string): string;
     getNativeCurrencyAddress(): string;
     txsTransfer(signer: string, token: string, amount: bigint, dstAddress: string, feeRate?: string): Promise<SolanaTx[]>;
     transfer(signer: SolanaSigner, token: string, amount: bigint, dstAddress: string, txOptions?: TransactionConfirmationOptions): Promise<string>;
@@ -46,6 +48,10 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, So
     deserializeTx(txData: string): Promise<SolanaTx>;
     getTxIdStatus(txId: string): Promise<"not_found" | "pending" | "success" | "reverted">;
     getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    getFinalizedBlock(): Promise<{
+        height: number;
+        blockHash: string;
+    }>;
     offBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): boolean;
     onBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): void;
     onBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): void;
@@ -55,4 +61,5 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, So
     isValidToken(tokenIdentifier: string): boolean;
     randomAddress(): string;
     randomSigner(): SolanaSigner;
+    wrapSigner(signer: Wallet): Promise<SolanaSigner>;
 }

package/dist/solana/chain/SolanaChainInterface.js

@@ -45,6 +45,9 @@ class SolanaChainInterface {
     isValidAddress(address) {
         return SolanaAddresses_1.SolanaAddresses.isValidAddress(address);
     }
+    normalizeAddress(address) {
+        return address;
+    }
     getNativeCurrencyAddress() {
         return this.Tokens.getNativeCurrencyAddress().toString();
     }
@@ -73,6 +76,13 @@ class SolanaChainInterface {
     getTxStatus(tx) {
         return this.Transactions.getTxStatus(tx);
     }
+    async getFinalizedBlock() {
+        const { block } = await this.Blocks.findLatestParsedBlock("finalized");
+        return {
+            height: block.blockHeight,
+            blockHash: block.blockhash
+        };
+    }
     ///////////////////////////////////
     //// Callbacks & handlers
     offBeforeTxReplace(callback) {
@@ -108,5 +118,8 @@ class SolanaChainInterface {
         const wallet = new SolanaKeypairWallet_1.SolanaKeypairWallet(keypair);
         return new SolanaSigner_1.SolanaSigner(wallet, keypair);
     }
+    wrapSigner(signer) {
+        return Promise.resolve(new SolanaSigner_1.SolanaSigner(signer));
+    }
 }
 exports.SolanaChainInterface = SolanaChainInterface;

package/dist/solana/chain/modules/SolanaTransactions.js

@@ -6,6 +6,7 @@ const SolanaModule_1 = require("../SolanaModule");
 const bs58 = require("bs58");
 const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
+const base_1 = require("@atomiqlabs/base");
 class SolanaTransactions extends SolanaModule_1.SolanaModule {
     /**
      * Sends raw solana transaction, first through the cbkSendTransaction callback (for e.g. sending the transaction
@@ -54,7 +55,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
                     resolve(signature);
                 }
                 if (status === "reverted")
-                    reject(new Error("Transaction reverted!"));
+                    reject(new base_1.TransactionRevertedError("Transaction reverted!"));
                 clearInterval(watchdogInterval);
             }, this.retryPolicy?.transactionResendInterval || 3000);
             if (abortSignal != null)
@@ -95,7 +96,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
             if (status === "success")
                 return signature;
             if (status === "reverted")
-                throw new Error("Transaction reverted!");
+                throw new base_1.TransactionRevertedError("Transaction reverted!");
             if (err instanceof web3_js_1.TransactionExpiredBlockheightExceededError || err.toString().startsWith("TransactionExpiredBlockheightExceededError")) {
                 throw new Error("Transaction expired before confirmation, please try again!");
             }
@@ -104,7 +105,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
             }
         }
         if (result.value.err != null)
-            throw new Error("Transaction reverted!");
+            throw new base_1.TransactionRevertedError("Transaction reverted!");
         return signature;
     }
     /**
@@ -209,9 +210,10 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
         };
         this.logger.debug("sendAndConfirm(): sending transactions, count: " + _txs.length +
             " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
+        const BATCH_SIZE = 50;
         const signatures = [];
-        for (let e = 0; e < _txs.length; e += 50) {
-            const txs = _txs.slice(e, e + 50);
+        for (let e = 0; e < _txs.length; e += BATCH_SIZE) {
+            const txs = _txs.slice(e, e + BATCH_SIZE);
             await this.prepareTransactions(signer, txs);
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
             signedTxs.forEach((tx, index) => {
@@ -220,27 +222,16 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
                 solTx.tx = tx;
             });
             this.logger.debug("sendAndConfirm(): sending transaction batch (" + e + ".." + (e + 50) + "), count: " + txs.length);
-            if (parallel) {
-                const promises = [];
-                for (let solTx of txs) {
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    if (waitForConfirmation)
-                        promises.push(this.confirmTransaction(solTx, abortSignal, "confirmed"));
-                    signatures.push(signature);
-                }
-                if (promises.length > 0)
-                    await Promise.all(promises);
-            }
-            else {
-                for (let i = 0; i < txs.length; i++) {
-                    const solTx = txs[i];
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
-                    //Don't await the last promise when !waitForConfirmation
-                    if (i < txs.length - 1 || e + 50 < _txs.length || waitForConfirmation)
-                        await confirmPromise;
-                    signatures.push(signature);
-                }
+            //For solana we are forced to send txs one-by-one even with parallel, as we cannot determine their order upfront,
+            // however e.g. Jito could possibly handle sending a single package of up to 5 txns in order.
+            for (let i = 0; i < txs.length; i++) {
+                const solTx = txs[i];
+                const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
+                const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
+                //Don't await the last promise when !waitForConfirmation
+                if (i < txs.length - 1 || e + 50 < _txs.length || waitForConfirmation)
+                    await confirmPromise;
+                signatures.push(signature);
             }
         }
         this.logger.info("sendAndConfirm(): sent transactions, count: " + _txs.length +

package/dist/solana/swaps/SolanaSwapProgram.d.ts

@@ -118,6 +118,12 @@ export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> im
      * @param data
      */
     getCommitStatus(signer: string, data: SolanaSwapData): Promise<SwapCommitState>;
+    getCommitStatuses(request: {
+        signer: string;
+        swapData: SolanaSwapData;
+    }[]): Promise<{
+        [p: string]: SwapCommitState;
+    }>;
     /**
      * Checks the status of the specific payment hash
      *
@@ -185,18 +191,18 @@ export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> im
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
+    getCommitFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
     /**
      * Get the estimated solana fee of the commit transaction, without any deposits
      */
-    getRawCommitFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
+    getRawCommitFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
+    getRefundFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRawRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
+    getRawRefundFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint>;
     getExtraData(outputScript: Buffer, amount: bigint, confirmations: number, nonce?: bigint): Buffer;
 }

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -20,6 +20,7 @@ const BN = require("bn.js");
 function toPublicKeyOrNull(str) {
     return str == null ? null : new web3_js_1.PublicKey(str);
 }
+const MAX_PARALLEL_COMMIT_STATUS_CHECKS = 5;
 class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     constructor(chainInterface, btcRelay, storage, programAddress) {
         super(chainInterface, programIdl, programAddress);
@@ -237,6 +238,21 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
             return { type: base_1.SwapCommitStateType.EXPIRED };
         return { type: base_1.SwapCommitStateType.NOT_COMMITED };
     }
+    async getCommitStatuses(request) {
+        const result = {};
+        let promises = [];
+        for (let { signer, swapData } of request) {
+            promises.push(this.getCommitStatus(signer, swapData).then(val => {
+                result[swapData.getEscrowHash()] = val;
+            }));
+            if (promises.length >= MAX_PARALLEL_COMMIT_STATUS_CHECKS) {
+                await Promise.all(promises);
+                promises = [];
+            }
+        }
+        await Promise.all(promises);
+        return result;
+    }
     /**
      * Checks the status of the specific payment hash
      *
@@ -439,25 +455,25 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(swapData, feeRate) {
+    getCommitFee(signer, swapData, feeRate) {
         return this.Init.getInitFee(swapData, feeRate);
     }
     /**
      * Get the estimated solana fee of the commit transaction, without any deposits
      */
-    getRawCommitFee(swapData, feeRate) {
+    getRawCommitFee(signer, swapData, feeRate) {
         return this.Init.getRawInitFee(swapData, feeRate);
     }
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(swapData, feeRate) {
+    getRefundFee(signer, swapData, feeRate) {
         return this.Refund.getRefundFee(swapData, feeRate);
     }
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRawRefundFee(swapData, feeRate) {
+    getRawRefundFee(signer, swapData, feeRate) {
         return this.Refund.getRawRefundFee(swapData, feeRate);
     }
     getExtraData(outputScript, amount, confirmations, nonce) {

package/dist/solana/wallet/SolanaSigner.d.ts

@@ -2,6 +2,7 @@ import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
 import { AbstractSigner } from "@atomiqlabs/base";
 import { PublicKey, Signer } from "@solana/web3.js";
 export declare class SolanaSigner implements AbstractSigner {
+    type: "AtomiqAbstractSigner";
     wallet: Wallet;
     keypair?: Signer;
     constructor(wallet: Wallet, keypair?: Signer);

package/dist/solana/wallet/SolanaSigner.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaSigner = void 0;
 class SolanaSigner {
     constructor(wallet, keypair) {
+        this.type = "AtomiqAbstractSigner";
         this.wallet = wallet;
         this.keypair = keypair;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^11.0.0",
+    "@atomiqlabs/base": "^12.0.0",
     "@noble/hashes": "^1.7.1",
     "bn.js": "5.2.1",
     "bs58": "4.0.1",

package/src/solana/SolanaChainType.ts

@@ -7,6 +7,7 @@ import {SolanaSwapData} from "./swaps/SolanaSwapData";
 import {SolanaChainEventsBrowser} from "./events/SolanaChainEventsBrowser";
 import {SolanaBtcRelay} from "./btcrelay/SolanaBtcRelay";
 import {SolanaChainInterface} from "./chain/SolanaChainInterface";
+import {Wallet} from "@coral-xyz/anchor/dist/cjs/provider";
 
 export type SolanaChainType = ChainType<
     "SOLANA",
@@ -14,6 +15,7 @@ export type SolanaChainType = ChainType<
     SolanaPreFetchVerification,
     SolanaTx,
     SolanaSigner,
+    Wallet,
     SolanaSwapData,
     SolanaSwapProgram,
     SolanaChainInterface,

package/src/solana/chain/SolanaChainInterface.ts

@@ -12,6 +12,7 @@ import {SolanaAddresses} from "./modules/SolanaAddresses";
 import {SolanaSigner} from "../wallet/SolanaSigner";
 import {Buffer} from "buffer";
 import {SolanaKeypairWallet} from "../wallet/SolanaKeypairWallet";
+import {Wallet} from "@coral-xyz/anchor/dist/cjs/provider";
 
 export type SolanaRetryPolicy = {
     maxRetries?: number,
@@ -23,7 +24,8 @@ export type SolanaRetryPolicy = {
 export class SolanaChainInterface implements ChainInterface<
     SolanaTx,
     SolanaSigner,
-    "SOLANA"
+    "SOLANA",
+    Wallet
 > {
     readonly chainId = "SOLANA";
 
@@ -78,6 +80,10 @@ export class SolanaChainInterface implements ChainInterface<
         return SolanaAddresses.isValidAddress(address);
     }
 
+    normalizeAddress(address: string): string {
+        return address;
+    }
+
     getNativeCurrencyAddress(): string {
         return this.Tokens.getNativeCurrencyAddress().toString();
     }
@@ -128,6 +134,14 @@ export class SolanaChainInterface implements ChainInterface<
         return this.Transactions.getTxStatus(tx);
     }
 
+    async getFinalizedBlock(): Promise<{ height: number; blockHash: string }> {
+        const {block} = await this.Blocks.findLatestParsedBlock("finalized");
+        return {
+            height: block.blockHeight,
+            blockHash: block.blockhash
+        };
+    }
+
 
     ///////////////////////////////////
     //// Callbacks & handlers
@@ -172,4 +186,8 @@ export class SolanaChainInterface implements ChainInterface<
         return new SolanaSigner(wallet, keypair);
     }
 
+    wrapSigner(signer: Wallet): Promise<SolanaSigner> {
+        return Promise.resolve(new SolanaSigner(signer));
+    }
+
 }

package/src/solana/chain/modules/SolanaTransactions.ts

@@ -9,6 +9,7 @@ import * as bs58 from "bs58";
 import {tryWithRetries} from "../../../utils/Utils";
 import {Buffer} from "buffer";
 import {SolanaSigner} from "../../wallet/SolanaSigner";
+import {TransactionRevertedError} from "@atomiqlabs/base";
 
 export type SolanaTx = {tx: Transaction, signers: Signer[]};
 
@@ -74,7 +75,7 @@ export class SolanaTransactions extends SolanaModule {
                     this.logger.info("txConfirmationAndResendWatchdog(): transaction confirmed from HTTP polling, signature: "+signature);
                     resolve(signature);
                 }
-                if(status==="reverted") reject(new Error("Transaction reverted!"));
+                if(status==="reverted") reject(new TransactionRevertedError("Transaction reverted!"));
                 clearInterval(watchdogInterval);
             }, this.retryPolicy?.transactionResendInterval || 3000);
 
@@ -119,14 +120,14 @@ export class SolanaTransactions extends SolanaModule {
             );
             this.logger.info("txConfirmFromWebsocket(): transaction status: "+status+" signature: "+signature);
             if(status==="success") return signature;
-            if(status==="reverted") throw new Error("Transaction reverted!");
+            if(status==="reverted") throw new TransactionRevertedError("Transaction reverted!");
             if(err instanceof TransactionExpiredBlockheightExceededError || err.toString().startsWith("TransactionExpiredBlockheightExceededError")) {
                 throw new Error("Transaction expired before confirmation, please try again!");
             } else {
                 throw err;
             }
         }
-        if(result.value.err!=null) throw new Error("Transaction reverted!");
+        if(result.value.err!=null) throw new TransactionRevertedError("Transaction reverted!");
         return signature;
     }
 
@@ -239,9 +240,11 @@ export class SolanaTransactions extends SolanaModule {
         this.logger.debug("sendAndConfirm(): sending transactions, count: "+_txs.length+
             " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
 
+        const BATCH_SIZE = 50;
+
         const signatures: string[] = [];
-        for(let e=0;e<_txs.length;e+=50) {
-            const txs = _txs.slice(e, e+50);
+        for(let e=0;e<_txs.length;e+=BATCH_SIZE) {
+            const txs = _txs.slice(e, e+BATCH_SIZE);
 
             await this.prepareTransactions(signer, txs)
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
@@ -252,23 +255,15 @@ export class SolanaTransactions extends SolanaModule {
             });
             this.logger.debug("sendAndConfirm(): sending transaction batch ("+e+".."+(e+50)+"), count: "+txs.length);
 
-            if(parallel) {
-                const promises: Promise<void>[] = [];
-                for(let solTx of txs) {
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    if(waitForConfirmation) promises.push(this.confirmTransaction(solTx, abortSignal, "confirmed"));
-                    signatures.push(signature);
-                }
-                if(promises.length>0) await Promise.all(promises);
-            } else {
-                for(let i=0;i<txs.length;i++) {
-                    const solTx = txs[i];
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
-                    //Don't await the last promise when !waitForConfirmation
-                    if(i<txs.length-1 || e+50<_txs.length || waitForConfirmation) await confirmPromise;
-                    signatures.push(signature);
-                }
+            //For solana we are forced to send txs one-by-one even with parallel, as we cannot determine their order upfront,
+            // however e.g. Jito could possibly handle sending a single package of up to 5 txns in order.
+            for(let i=0;i<txs.length;i++) {
+                const solTx = txs[i];
+                const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
+                const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
+                //Don't await the last promise when !waitForConfirmation
+                if(i<txs.length-1 || e+50<_txs.length || waitForConfirmation) await confirmPromise;
+                signatures.push(signature);
             }
         }
 

package/src/solana/swaps/SolanaSwapProgram.ts

@@ -41,6 +41,8 @@ function toPublicKeyOrNull(str: string | null): PublicKey | null {
     return str==null ? null : new PublicKey(str);
 }
 
+const MAX_PARALLEL_COMMIT_STATUS_CHECKS = 5;
+
 export class SolanaSwapProgram
     extends SolanaProgramBase<SwapProgram>
     implements SwapContract<
@@ -308,6 +310,26 @@ export class SolanaSwapProgram
         return {type: SwapCommitStateType.NOT_COMMITED};
     }
 
+    async getCommitStatuses(request: { signer: string; swapData: SolanaSwapData }[]): Promise<{
+        [p: string]: SwapCommitState
+    }> {
+        const result: {
+            [p: string]: SwapCommitState
+        } = {};
+        let promises: Promise<void>[] = [];
+        for(let {signer, swapData} of request) {
+            promises.push(this.getCommitStatus(signer, swapData).then(val => {
+                result[swapData.getEscrowHash()] = val;
+            }));
+            if(promises.length>=MAX_PARALLEL_COMMIT_STATUS_CHECKS) {
+                await Promise.all(promises);
+                promises = [];
+            }
+        }
+        await Promise.all(promises);
+        return result;
+    }
+
     /**
      * Checks the status of the specific payment hash
      *
@@ -662,28 +684,28 @@ export class SolanaSwapProgram
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
+    getCommitFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
         return this.Init.getInitFee(swapData, feeRate);
     }
 
     /**
      * Get the estimated solana fee of the commit transaction, without any deposits
      */
-    getRawCommitFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
+    getRawCommitFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
         return this.Init.getRawInitFee(swapData, feeRate);
     }
 
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
+    getRefundFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
         return this.Refund.getRefundFee(swapData, feeRate);
     }
 
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRawRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
+    getRawRefundFee(signer: string, swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
         return this.Refund.getRawRefundFee(swapData, feeRate);
     }
 

package/src/solana/wallet/SolanaSigner.ts

@@ -3,6 +3,7 @@ import {AbstractSigner} from "@atomiqlabs/base";
 import {PublicKey, Signer} from "@solana/web3.js";
 
 export class SolanaSigner implements AbstractSigner {
+    type = "AtomiqAbstractSigner" as const;
 
     wallet: Wallet;
     keypair?: Signer;