@atomiqlabs/chain-solana 8.0.2 → 9.0.0-beta.0

package/dist/index.d.ts

@@ -1,17 +1,17 @@
 export * from "./solana/btcrelay/headers/SolanaBtcHeader";
 export * from "./solana/btcrelay/headers/SolanaBtcStoredHeader";
 export * from "./solana/btcrelay/SolanaBtcRelay";
-export * from "./solana/base/modules/SolanaAddresses";
-export * from "./solana/base/modules/SolanaBlocks";
-export * from "./solana/base/modules/SolanaEvents";
-export * from "./solana/base/modules/SolanaFees";
-export * from "./solana/base/modules/SolanaSignatures";
-export * from "./solana/base/modules/SolanaSlots";
-export * from "./solana/base/modules/SolanaTokens";
-export * from "./solana/base/modules/SolanaTransactions";
-export * from "./solana/base/SolanaAction";
-export * from "./solana/base/SolanaBase";
-export * from "./solana/base/SolanaModule";
+export * from "./solana/chain/modules/SolanaAddresses";
+export * from "./solana/chain/modules/SolanaBlocks";
+export * from "./solana/chain/modules/SolanaEvents";
+export * from "./solana/chain/modules/SolanaFees";
+export * from "./solana/chain/modules/SolanaSignatures";
+export * from "./solana/chain/modules/SolanaSlots";
+export * from "./solana/chain/modules/SolanaTokens";
+export * from "./solana/chain/modules/SolanaTransactions";
+export * from "./solana/chain/SolanaAction";
+export * from "./solana/chain/SolanaChainInterface";
+export * from "./solana/chain/SolanaModule";
 export * from "./solana/program/modules/SolanaProgramEvents";
 export * from "./solana/program/SolanaProgramBase";
 export * from "./solana/swaps/SolanaSwapProgram";

package/dist/index.js

@@ -17,17 +17,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./solana/btcrelay/headers/SolanaBtcHeader"), exports);
 __exportStar(require("./solana/btcrelay/headers/SolanaBtcStoredHeader"), exports);
 __exportStar(require("./solana/btcrelay/SolanaBtcRelay"), exports);
-__exportStar(require("./solana/base/modules/SolanaAddresses"), exports);
-__exportStar(require("./solana/base/modules/SolanaBlocks"), exports);
-__exportStar(require("./solana/base/modules/SolanaEvents"), exports);
-__exportStar(require("./solana/base/modules/SolanaFees"), exports);
-__exportStar(require("./solana/base/modules/SolanaSignatures"), exports);
-__exportStar(require("./solana/base/modules/SolanaSlots"), exports);
-__exportStar(require("./solana/base/modules/SolanaTokens"), exports);
-__exportStar(require("./solana/base/modules/SolanaTransactions"), exports);
-__exportStar(require("./solana/base/SolanaAction"), exports);
-__exportStar(require("./solana/base/SolanaBase"), exports);
-__exportStar(require("./solana/base/SolanaModule"), exports);
+__exportStar(require("./solana/chain/modules/SolanaAddresses"), exports);
+__exportStar(require("./solana/chain/modules/SolanaBlocks"), exports);
+__exportStar(require("./solana/chain/modules/SolanaEvents"), exports);
+__exportStar(require("./solana/chain/modules/SolanaFees"), exports);
+__exportStar(require("./solana/chain/modules/SolanaSignatures"), exports);
+__exportStar(require("./solana/chain/modules/SolanaSlots"), exports);
+__exportStar(require("./solana/chain/modules/SolanaTokens"), exports);
+__exportStar(require("./solana/chain/modules/SolanaTransactions"), exports);
+__exportStar(require("./solana/chain/SolanaAction"), exports);
+__exportStar(require("./solana/chain/SolanaChainInterface"), exports);
+__exportStar(require("./solana/chain/SolanaModule"), exports);
 __exportStar(require("./solana/program/modules/SolanaProgramEvents"), exports);
 __exportStar(require("./solana/program/SolanaProgramBase"), exports);
 __exportStar(require("./solana/swaps/SolanaSwapProgram"), exports);

package/dist/solana/SolanaChainType.d.ts

@@ -1,9 +1,10 @@
 import { ChainType } from "@atomiqlabs/base";
-import { SolanaTx } from "./base/modules/SolanaTransactions";
+import { SolanaTx } from "./chain/modules/SolanaTransactions";
 import { SolanaPreFetchData, SolanaPreFetchVerification } from "./swaps/modules/SwapInit";
 import { SolanaSigner } from "./wallet/SolanaSigner";
 import { SolanaSwapProgram } from "./swaps/SolanaSwapProgram";
 import { SolanaSwapData } from "./swaps/SolanaSwapData";
 import { SolanaChainEventsBrowser } from "./events/SolanaChainEventsBrowser";
 import { SolanaBtcRelay } from "./btcrelay/SolanaBtcRelay";
-export type SolanaChainType = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SolanaSigner, SolanaSwapData, SolanaSwapProgram, SolanaChainEventsBrowser, SolanaBtcRelay<any>>;
+import { SolanaChainInterface } from "./chain/SolanaChainInterface";
+export type SolanaChainType = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SolanaSigner, SolanaSwapData, SolanaSwapProgram, SolanaChainInterface, SolanaChainEventsBrowser, SolanaBtcRelay<any>, never, never, never>;

package/dist/solana/SolanaInitializer.d.ts

@@ -1,8 +1,8 @@
 import { BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer, IStorageManager, StorageObject } from "@atomiqlabs/base";
 import { Connection } from "@solana/web3.js";
 import { StoredDataAccount } from "./swaps/modules/SolanaDataAccount";
-import { SolanaRetryPolicy } from "./base/SolanaBase";
-import { SolanaFees } from "./base/modules/SolanaFees";
+import { SolanaRetryPolicy } from "./chain/SolanaChainInterface";
+import { SolanaFees } from "./chain/modules/SolanaFees";
 import { SolanaChainType } from "./SolanaChainType";
 export type SolanaAssetsType = BaseTokenType<"WBTC" | "USDC" | "USDT" | "SOL" | "BONK">;
 export type SolanaSwapperOptions = {

package/dist/solana/SolanaInitializer.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaInitializer = exports.initializeSolana = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const SolanaFees_1 = require("./base/modules/SolanaFees");
+const SolanaChainInterface_1 = require("./chain/SolanaChainInterface");
+const SolanaFees_1 = require("./chain/modules/SolanaFees");
 const SolanaBtcRelay_1 = require("./btcrelay/SolanaBtcRelay");
 const SolanaChains_1 = require("./SolanaChains");
 const SolanaSwapProgram_1 = require("./swaps/SolanaSwapProgram");
@@ -36,8 +37,9 @@ function initializeSolana(options, bitcoinRpc, network, storageCtor) {
         new web3_js_1.Connection(options.rpcUrl) :
         options.rpcUrl;
     const Fees = options.fees ?? new SolanaFees_1.SolanaFees(connection, 200000, 4, 100);
-    const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(connection, bitcoinRpc, options.btcRelayContract ?? SolanaChains_1.SolanaChains[network].addresses.btcRelayContract, Fees);
-    const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(connection, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), options.swapContract ?? SolanaChains_1.SolanaChains[network].addresses.swapContract, options.retryPolicy ?? { transactionResendInterval: 1000 }, Fees);
+    const chainInterface = new SolanaChainInterface_1.SolanaChainInterface(connection, options.retryPolicy ?? { transactionResendInterval: 1000 }, Fees);
+    const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(chainInterface, bitcoinRpc, options.btcRelayContract ?? SolanaChains_1.SolanaChains[network].addresses.btcRelayContract);
+    const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(chainInterface, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), options.swapContract ?? SolanaChains_1.SolanaChains[network].addresses.swapContract);
     const chainEvents = new SolanaChainEventsBrowser_1.SolanaChainEventsBrowser(connection, swapContract);
     return {
         chainId,
@@ -45,8 +47,10 @@ function initializeSolana(options, bitcoinRpc, network, storageCtor) {
         swapContract,
         chainEvents,
         swapDataConstructor: SolanaSwapData_1.SolanaSwapData,
-        //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
-        storagePrefix: "SOLv4-" + network + "-"
+        chainInterface,
+        spvVaultContract: null,
+        spvVaultDataConstructor: null,
+        spvVaultWithdrawalDataConstructor: null
     };
 }
 exports.initializeSolana = initializeSolana;

package/dist/solana/btcrelay/SolanaBtcRelay.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import { Connection, PublicKey, Signer, Transaction } from "@solana/web3.js";
+import { PublicKey, Signer, Transaction } from "@solana/web3.js";
 import { SolanaBtcStoredHeader } from "./headers/SolanaBtcStoredHeader";
 import { BitcoinRpc, BtcBlock, BtcRelay } from "@atomiqlabs/base";
 import { SolanaProgramBase } from "../program/SolanaProgramBase";
-import { SolanaAction } from "../base/SolanaAction";
+import { SolanaAction } from "../chain/SolanaAction";
 import { Buffer } from "buffer";
-import { SolanaFees } from "../base/modules/SolanaFees";
 import { SolanaSigner } from "../wallet/SolanaSigner";
+import { SolanaChainInterface } from "../chain/SolanaChainInterface";
 export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> implements BtcRelay<SolanaBtcStoredHeader, {
     tx: Transaction;
     signers: Signer[];
@@ -43,7 +43,7 @@ export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBas
     readonly maxHeadersPerTx: number;
     readonly maxForkHeadersPerTx: number;
     readonly maxShortForkHeadersPerTx: number;
-    constructor(connection: Connection, bitcoinRpc: BitcoinRpc<B>, programAddress?: string, solanaFeeEstimator?: SolanaFees);
+    constructor(chainInterface: SolanaChainInterface, bitcoinRpc: BitcoinRpc<B>, programAddress?: string);
     /**
      * Gets set of block commitments representing current main chain from the mainState
      *

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -7,9 +7,8 @@ const SolanaBtcHeader_1 = require("./headers/SolanaBtcHeader");
 const programIdl = require("./program/programIdl.json");
 const base_1 = require("@atomiqlabs/base");
 const SolanaProgramBase_1 = require("../program/SolanaProgramBase");
-const SolanaAction_1 = require("../base/SolanaAction");
+const SolanaAction_1 = require("../chain/SolanaAction");
 const buffer_1 = require("buffer");
-const SolanaFees_1 = require("../base/modules/SolanaFees");
 const BN = require("bn.js");
 const MAX_CLOSE_IX_PER_TX = 10;
 function serializeBlockHeader(e) {
@@ -37,7 +36,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     async Initialize(signer, header, epochStart, pastBlocksTimestamps) {
         const serializedBlock = serializeBlockHeader(header);
-        return new SolanaAction_1.SolanaAction(signer, this, await this.program.methods
+        return new SolanaAction_1.SolanaAction(signer, this.Chain, await this.program.methods
             .initialize(serializedBlock, header.getHeight(), header.getChainWork(), epochStart, pastBlocksTimestamps)
             .accounts({
             signer,
@@ -60,7 +59,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      * @param committedHeader
      */
     async Verify(signer, reversedTxId, confirmations, position, reversedMerkleProof, committedHeader) {
-        return new SolanaAction_1.SolanaAction(signer, this, await this.program.methods
+        return new SolanaAction_1.SolanaAction(signer, this.Chain, await this.program.methods
             .verifyTransaction(reversedTxId, confirmations, position, reversedMerkleProof, committedHeader)
             .accounts({
             signer,
@@ -69,7 +68,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             .instruction(), null, null, null, true);
     }
     async CloseForkAccount(signer, forkId) {
-        return new SolanaAction_1.SolanaAction(signer, this, await this.program.methods
+        return new SolanaAction_1.SolanaAction(signer, this.Chain, await this.program.methods
             .closeForkAccount(new BN(forkId))
             .accounts({
             signer,
@@ -78,8 +77,8 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         })
             .instruction(), 20000);
     }
-    constructor(connection, bitcoinRpc, programAddress, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
-        super(connection, programIdl, programAddress, null, solanaFeeEstimator);
+    constructor(chainInterface, bitcoinRpc, programAddress) {
+        super(chainInterface, programIdl, programAddress);
         this.BtcRelayMainState = this.pda("state");
         this.BtcRelayHeader = this.pda("header", (hash) => [hash]);
         this.BtcRelayFork = this.pda("fork", (forkId, pubkey) => [new BN(forkId).toArrayLike(buffer_1.Buffer, "le", 8), pubkey.toBuffer()]);
@@ -140,8 +139,8 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         }))
             .transaction();
         tx.feePayer = signer;
-        this.Fees.applyFeeRateBegin(tx, null, feeRate);
-        this.Fees.applyFeeRateEnd(tx, null, feeRate);
+        this.Chain.Fees.applyFeeRateBegin(tx, null, feeRate);
+        this.Chain.Fees.applyFeeRateEnd(tx, null, feeRate);
         const computedCommitedHeaders = this.computeCommitedHeaders(storedHeader, blockHeaderObj);
         const lastStoredHeader = computedCommitedHeaders[computedCommitedHeaders.length - 1];
         if (forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(buffer_1.Buffer.from(lastStoredHeader.chainWork), tipWork)) {
@@ -366,7 +365,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         const mainState = await this.program.account.mainState.fetch(this.BtcRelayMainState);
         let forkId = mainState.forkCounter.toNumber();
         const txs = [];
-        let action = new SolanaAction_1.SolanaAction(signer.getPublicKey(), this);
+        let action = new SolanaAction_1.SolanaAction(signer.getPublicKey(), this.Chain);
         let lastCheckedId = lastSweepId;
         for (let i = lastSweepId == null ? 0 : lastSweepId + 1; i <= forkId; i++) {
             lastCheckedId = i;
@@ -378,14 +377,14 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             action.add(await this.CloseForkAccount(signer.getPublicKey(), i));
             if (action.ixsLength() >= MAX_CLOSE_IX_PER_TX) {
                 await action.addToTxs(txs);
-                action = new SolanaAction_1.SolanaAction(signer.getPublicKey(), this);
+                action = new SolanaAction_1.SolanaAction(signer.getPublicKey(), this.Chain);
             }
         }
         if (action.ixsLength() >= MAX_CLOSE_IX_PER_TX) {
             await action.addToTxs(txs);
         }
         if (txs.length > 0) {
-            const signatures = await this.Transactions.sendAndConfirm(signer, txs, true);
+            const signatures = await this.Chain.sendAndConfirm(signer, txs, true);
             this.logger.info("sweepForkData(): forks swept, signatures: " + signatures.join());
         }
         return lastCheckedId;
@@ -422,7 +421,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     getMainFeeRate(signer) {
         const _signer = signer == null ? null : new web3_js_1.PublicKey(signer);
-        return this.Fees.getFeeRate(_signer == null ? [this.BtcRelayMainState] : [
+        return this.Chain.Fees.getFeeRate(_signer == null ? [this.BtcRelayMainState] : [
             _signer,
             this.BtcRelayMainState
         ]);
@@ -432,7 +431,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     getForkFeeRate(signer, forkId) {
         const _signer = new web3_js_1.PublicKey(signer);
-        return this.Fees.getFeeRate([
+        return this.Chain.Fees.getFeeRate([
             _signer,
             this.BtcRelayMainState,
             this.BtcRelayFork(forkId, _signer)

package/dist/solana/{base → chain}/SolanaAction.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
 import { SolanaTx } from "./modules/SolanaTransactions";
-import { SolanaBase } from "./SolanaBase";
+import { SolanaChainInterface } from "./SolanaChainInterface";
 export declare class SolanaAction {
     computeBudget: number;
     readonly mainSigner: PublicKey;
@@ -9,7 +9,7 @@ export declare class SolanaAction {
     private feeRate;
     private readonly signers;
     private firstIxBeforeComputeBudget;
-    constructor(mainSigner: PublicKey, root: SolanaBase, instructions?: TransactionInstruction[] | TransactionInstruction, computeBudget?: number, feeRate?: string, signers?: Signer[], firstIxBeforeComputeBudget?: boolean);
+    constructor(mainSigner: PublicKey, root: SolanaChainInterface, instructions?: TransactionInstruction[] | TransactionInstruction, computeBudget?: number, feeRate?: string, signers?: Signer[], firstIxBeforeComputeBudget?: boolean);
     private estimateFee;
     addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]): void;
     add(action: SolanaAction): this;

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

@@ -0,0 +1,58 @@
+/// <reference types="node" />
+import { Connection, SendOptions } from "@solana/web3.js";
+import { SolanaFees } from "./modules/SolanaFees";
+import { SolanaBlocks } from "./modules/SolanaBlocks";
+import { SolanaSlots } from "./modules/SolanaSlots";
+import { SolanaTokens } from "./modules/SolanaTokens";
+import { SolanaTransactions, SolanaTx } from "./modules/SolanaTransactions";
+import { SolanaSignatures } from "./modules/SolanaSignatures";
+import { SolanaEvents } from "./modules/SolanaEvents";
+import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
+import { SolanaSigner } from "../wallet/SolanaSigner";
+import { Buffer } from "buffer";
+export type SolanaRetryPolicy = {
+    maxRetries?: number;
+    delay?: number;
+    exponential?: boolean;
+    transactionResendInterval?: number;
+};
+export declare class SolanaChainInterface implements ChainInterface<SolanaTx, SolanaSigner, "SOLANA"> {
+    readonly chainId = "SOLANA";
+    readonly SLOT_TIME = 400;
+    readonly TX_SLOT_VALIDITY = 151;
+    readonly connection: Connection;
+    readonly retryPolicy: SolanaRetryPolicy;
+    readonly Blocks: SolanaBlocks;
+    Fees: SolanaFees;
+    readonly Slots: SolanaSlots;
+    readonly Tokens: SolanaTokens;
+    readonly Transactions: SolanaTransactions;
+    readonly Signatures: SolanaSignatures;
+    readonly Events: SolanaEvents;
+    protected readonly logger: {
+        debug: (msg: any, ...args: any[]) => void;
+        info: (msg: any, ...args: any[]) => void;
+        warn: (msg: any, ...args: any[]) => void;
+        error: (msg: any, ...args: any[]) => void;
+    };
+    constructor(connection: Connection, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
+    getBalance(signer: string, tokenAddress: string): Promise<bigint>;
+    isValidAddress(address: string): boolean;
+    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>;
+    sendAndConfirm(signer: SolanaSigner, txs: SolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    serializeTx(tx: SolanaTx): Promise<string>;
+    deserializeTx(txData: string): Promise<SolanaTx>;
+    getTxIdStatus(txId: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    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;
+    offBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): boolean;
+    onSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): void;
+    offSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): boolean;
+    isValidToken(tokenIdentifier: string): boolean;
+    randomAddress(): string;
+    randomSigner(): SolanaSigner;
+}

package/dist/solana/chain/SolanaChainInterface.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaChainInterface = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const SolanaFees_1 = require("./modules/SolanaFees");
+const SolanaBlocks_1 = require("./modules/SolanaBlocks");
+const SolanaSlots_1 = require("./modules/SolanaSlots");
+const SolanaTokens_1 = require("./modules/SolanaTokens");
+const SolanaTransactions_1 = require("./modules/SolanaTransactions");
+const SolanaSignatures_1 = require("./modules/SolanaSignatures");
+const SolanaEvents_1 = require("./modules/SolanaEvents");
+const Utils_1 = require("../../utils/Utils");
+const SolanaAddresses_1 = require("./modules/SolanaAddresses");
+const SolanaSigner_1 = require("../wallet/SolanaSigner");
+const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
+class SolanaChainInterface {
+    constructor(connection, retryPolicy, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
+        this.chainId = "SOLANA";
+        this.SLOT_TIME = 400;
+        this.TX_SLOT_VALIDITY = 151;
+        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
+        this.connection = connection;
+        this.retryPolicy = retryPolicy;
+        this.Blocks = new SolanaBlocks_1.SolanaBlocks(this);
+        this.Fees = solanaFeeEstimator;
+        this.Slots = new SolanaSlots_1.SolanaSlots(this);
+        this.Tokens = new SolanaTokens_1.SolanaTokens(this);
+        this.Transactions = new SolanaTransactions_1.SolanaTransactions(this);
+        this.Signatures = new SolanaSignatures_1.SolanaSignatures(this);
+        this.Events = new SolanaEvents_1.SolanaEvents(this);
+    }
+    async getBalance(signer, tokenAddress) {
+        const token = new web3_js_1.PublicKey(tokenAddress);
+        const publicKey = new web3_js_1.PublicKey(signer);
+        let { balance } = await this.Tokens.getTokenBalance(publicKey, token);
+        if (token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS)) {
+            const accountRentExemptCost = 1000000n;
+            balance = balance - accountRentExemptCost;
+            if (balance < 0n)
+                balance = 0n;
+        }
+        this.logger.debug("getBalance(): token balance, token: " + token.toBase58() + " balance: " + balance.toString(10));
+        return balance;
+    }
+    isValidAddress(address) {
+        return SolanaAddresses_1.SolanaAddresses.isValidAddress(address);
+    }
+    getNativeCurrencyAddress() {
+        return this.Tokens.getNativeCurrencyAddress().toString();
+    }
+    txsTransfer(signer, token, amount, dstAddress, feeRate) {
+        return this.Tokens.txsTransfer(new web3_js_1.PublicKey(signer), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), feeRate);
+    }
+    async transfer(signer, token, amount, dstAddress, txOptions) {
+        const txs = await this.Tokens.txsTransfer(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), txOptions?.feeRate);
+        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
+        return txId;
+    }
+    ////////////////////////////////////////////
+    //// Transactions
+    sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
+        return this.Transactions.sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
+    }
+    serializeTx(tx) {
+        return this.Transactions.serializeTx(tx);
+    }
+    deserializeTx(txData) {
+        return this.Transactions.deserializeTx(txData);
+    }
+    getTxIdStatus(txId) {
+        return this.Transactions.getTxIdStatus(txId);
+    }
+    getTxStatus(tx) {
+        return this.Transactions.getTxStatus(tx);
+    }
+    ///////////////////////////////////
+    //// Callbacks & handlers
+    offBeforeTxReplace(callback) {
+        return true;
+    }
+    onBeforeTxReplace(callback) { }
+    onBeforeTxSigned(callback) {
+        this.Transactions.onBeforeTxSigned(callback);
+    }
+    offBeforeTxSigned(callback) {
+        return this.Transactions.offBeforeTxSigned(callback);
+    }
+    onSendTransaction(callback) {
+        this.Transactions.onSendTransaction(callback);
+    }
+    offSendTransaction(callback) {
+        return this.Transactions.offSendTransaction(callback);
+    }
+    isValidToken(tokenIdentifier) {
+        try {
+            new web3_js_1.PublicKey(tokenIdentifier);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    randomAddress() {
+        return web3_js_1.Keypair.generate().publicKey.toString();
+    }
+    randomSigner() {
+        const keypair = web3_js_1.Keypair.generate();
+        const wallet = new SolanaKeypairWallet_1.SolanaKeypairWallet(keypair);
+        return new SolanaSigner_1.SolanaSigner(wallet, keypair);
+    }
+}
+exports.SolanaChainInterface = SolanaChainInterface;

package/dist/solana/{base → chain}/SolanaModule.d.ts

@@ -1,14 +1,14 @@
 import { Connection } from "@solana/web3.js";
-import { SolanaBase, SolanaRetryPolicy } from "./SolanaBase";
+import { SolanaChainInterface, SolanaRetryPolicy } from "./SolanaChainInterface";
 export declare class SolanaModule {
     protected readonly connection: Connection;
     protected readonly retryPolicy: SolanaRetryPolicy;
-    protected readonly root: SolanaBase;
+    protected readonly root: SolanaChainInterface;
     protected readonly logger: {
         debug: (msg: any, ...args: any[]) => void;
         info: (msg: any, ...args: any[]) => void;
         warn: (msg: any, ...args: any[]) => void;
         error: (msg: any, ...args: any[]) => void;
     };
-    constructor(root: SolanaBase);
+    constructor(root: SolanaChainInterface);
 }

package/dist/solana/chain/modules/SolanaAddresses.d.ts

@@ -0,0 +1,8 @@
+export declare class SolanaAddresses {
+    /**
+     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
+     *
+     * @param address
+     */
+    static isValidAddress(address: string): boolean;
+}

package/dist/solana/{base → chain}/modules/SolanaAddresses.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaAddresses = void 0;
-const SolanaModule_1 = require("../SolanaModule");
 const web3_js_1 = require("@solana/web3.js");
-class SolanaAddresses extends SolanaModule_1.SolanaModule {
+class SolanaAddresses {
     ///////////////////
     //// Address utils
     /**
@@ -11,7 +10,7 @@ class SolanaAddresses extends SolanaModule_1.SolanaModule {
      *
      * @param address
      */
-    isValidAddress(address) {
+    static isValidAddress(address) {
         try {
             return web3_js_1.PublicKey.isOnCurve(address);
         }

package/dist/solana/events/SolanaChainEventsBrowser.js

@@ -127,7 +127,6 @@ class SolanaChainEventsBrowser {
                     break;
             }
             parsedEvent.meta = {
-                blockTime: eventObject.blockTime,
                 timestamp: eventObject.blockTime,
                 txId: eventObject.signature
             };

package/dist/solana/program/SolanaProgramBase.d.ts

@@ -1,17 +1,23 @@
 /// <reference types="node" />
 import { Idl, Program } from "@coral-xyz/anchor";
-import { SolanaFees } from "../base/modules/SolanaFees";
-import { SolanaBase, SolanaRetryPolicy } from "../base/SolanaBase";
+import { SolanaChainInterface } from "../chain/SolanaChainInterface";
 import { SolanaProgramEvents } from "./modules/SolanaProgramEvents";
-import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+import { Keypair, PublicKey } from "@solana/web3.js";
 import { Buffer } from "buffer";
 /**
  * Base class providing program specific utilities
  */
-export declare class SolanaProgramBase<T extends Idl> extends SolanaBase {
+export declare class SolanaProgramBase<T extends Idl> {
+    protected readonly logger: {
+        debug: (msg: any, ...args: any[]) => void;
+        info: (msg: any, ...args: any[]) => void;
+        warn: (msg: any, ...args: any[]) => void;
+        error: (msg: any, ...args: any[]) => void;
+    };
     program: Program<T>;
     readonly Events: SolanaProgramEvents<T>;
-    constructor(connection: Connection, programIdl: any, programAddress?: string, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
+    readonly Chain: SolanaChainInterface;
+    constructor(chainInterface: SolanaChainInterface, programIdl: any, programAddress?: string);
     /**
      * Derives static PDA address from the seed
      *

package/dist/solana/program/SolanaProgramBase.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaProgramBase = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
-const SolanaFees_1 = require("../base/modules/SolanaFees");
-const SolanaBase_1 = require("../base/SolanaBase");
 const SolanaProgramEvents_1 = require("./modules/SolanaProgramEvents");
 const web3_js_1 = require("@solana/web3.js");
 const sha2_1 = require("@noble/hashes/sha2");
 const buffer_1 = require("buffer");
 const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
+const Utils_1 = require("../../utils/Utils");
 /**
  * Base class providing program specific utilities
  */
-class SolanaProgramBase extends SolanaBase_1.SolanaBase {
-    constructor(connection, programIdl, programAddress, retryPolicy, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
-        super(connection, retryPolicy, solanaFeeEstimator);
-        this.program = new anchor_1.Program(programIdl, programAddress || programIdl.metadata.address, new anchor_1.AnchorProvider(connection, new SolanaKeypairWallet_1.SolanaKeypairWallet(web3_js_1.Keypair.generate()), {}));
-        this.Events = new SolanaProgramEvents_1.SolanaProgramEvents(this);
+class SolanaProgramBase {
+    constructor(chainInterface, programIdl, programAddress) {
+        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
+        this.Chain = chainInterface;
+        this.program = new anchor_1.Program(programIdl, programAddress || programIdl.metadata.address, new anchor_1.AnchorProvider(chainInterface.connection, new SolanaKeypairWallet_1.SolanaKeypairWallet(web3_js_1.Keypair.generate()), {}));
+        this.Events = new SolanaProgramEvents_1.SolanaProgramEvents(chainInterface, this);
     }
     pda(seed, func) {
         if (func == null) {

package/dist/solana/program/SolanaProgramModule.d.ts

@@ -0,0 +1,8 @@
+import { SolanaModule } from "../chain/SolanaModule";
+import { Idl } from "@coral-xyz/anchor";
+import { SolanaProgramBase } from "./SolanaProgramBase";
+import { SolanaChainInterface } from "../chain/SolanaChainInterface";
+export declare class SolanaProgramModule<IDL extends Idl> extends SolanaModule {
+    protected readonly program: SolanaProgramBase<IDL>;
+    constructor(chainInterface: SolanaChainInterface, program: SolanaProgramBase<IDL>);
+}

package/dist/solana/program/SolanaProgramModule.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaProgramModule = void 0;
+const SolanaModule_1 = require("../chain/SolanaModule");
+class SolanaProgramModule extends SolanaModule_1.SolanaModule {
+    constructor(chainInterface, program) {
+        super(chainInterface);
+        this.program = program;
+    }
+}
+exports.SolanaProgramModule = SolanaProgramModule;

package/dist/solana/program/modules/SolanaProgramEvents.d.ts

@@ -1,8 +1,9 @@
-import { SolanaEvents } from "../../base/modules/SolanaEvents";
+import { SolanaEvents } from "../../chain/modules/SolanaEvents";
 import { DecodeType, Event, Idl, IdlTypes } from "@coral-xyz/anchor";
 import { IdlField, IdlInstruction } from "@coral-xyz/anchor/dist/cjs/idl";
 import { ParsedMessage, PublicKey } from "@solana/web3.js";
 import { SolanaProgramBase } from "../SolanaProgramBase";
+import { SolanaChainInterface } from "../../chain/SolanaChainInterface";
 type DecodedFieldOrNull<D, Defined> = D extends IdlField ? DecodeType<D["type"], Defined> : unknown;
 type ArgsTuple<A extends IdlField[], Defined> = {
     [K in A[number]["name"]]: DecodedFieldOrNull<Extract<A[number], {
@@ -21,9 +22,9 @@ export type ProgramEvent<IDL extends Idl> = Event<IDL["events"][number], Record<
 export declare class SolanaProgramEvents<IDL extends Idl> extends SolanaEvents {
     private readonly programCoder;
     private readonly eventParser;
-    readonly root: SolanaProgramBase<any>;
+    private readonly program;
     private readonly nameMappedInstructions;
-    constructor(root: SolanaProgramBase<IDL>);
+    constructor(chain: SolanaChainInterface, program: SolanaProgramBase<IDL>);
     /**
      * Gets events from specific transaction as specified by signature, events are ordered from newest to oldest
      *