@atomiqlabs/chain-solana 13.0.11 → 13.2.1

package/README.md

@@ -0,0 +1,73 @@
+# @atomiqlabs/chain-solana
+
+`@atomiqlabs/chain-solana` is the Solana integration package for the Atomiq protocol.
+
+Within the Atomiq stack, this library provides the Solana-side building blocks used for Bitcoin-aware swaps on Solana. It includes:
+
+- the `SolanaInitializer` used to register Solana support in the Atomiq SDK
+- the `SolanaChainInterface` used to talk to Solana RPCs
+- Solana BTC relay and swap program wrappers
+- signer and wallet helpers for Solana integrations
+- connection retry and chain event utilities
+
+This package is intended for direct protocol integrations and for higher-level Atomiq SDK layers that need Solana chain support.
+
+## Installation
+
+Install the package with its `@solana/web3.js` peer dependency:
+
+```bash
+npm install @atomiqlabs/chain-solana @solana/web3.js
+```
+
+## Node-only Classes
+
+The default package entrypoint stays browser-safe and does not export classes that depend on Node's `fs` module.
+
+Import backend-only utilities from the dedicated `node` subpath:
+
+```ts
+import {SolanaChainEvents} from "@atomiqlabs/chain-solana/node";
+```
+
+## Supported Chains
+
+This package exports a single Solana initializer:
+
+- Solana via `SolanaInitializer`
+
+Canonical deployments currently defined in this package:
+
+| Chain | Canonical deployments included |
+| --- | --- |
+| Solana | `MAINNET`, `TESTNET` |
+
+In this package, the selected Bitcoin network determines which canonical Solana program addresses are used by default. `BitcoinNetwork.TESTNET4` is not wired to a Solana deployment here yet.
+
+The Solana implementation doesn't support the UTXO-controlled vault (SPV vault) contract, hence it can only process legacy HTLC & PrTLC based swaps.
+
+## SDK Example
+
+Initialize the Atomiq SDK with Solana network support:
+
+```ts
+import {SolanaInitializer} from "@atomiqlabs/chain-solana";
+import {BitcoinNetwork, SwapperFactory, TypedSwapper} from "@atomiqlabs/sdk";
+
+// Define chains that you want to support here
+const chains = [SolanaInitializer] as const;
+type SupportedChains = typeof chains;
+
+const Factory = new SwapperFactory<SupportedChains>(chains);
+
+const swapper: TypedSwapper<SupportedChains> = Factory.newSwapper({
+  chains: {
+    SOLANA: {
+      rpcUrl: solanaRpc // You can also pass a web3.js Connection object here
+    }
+  },
+  bitcoinNetwork: BitcoinNetwork.MAINNET // or BitcoinNetwork.TESTNET
+});
+```
+
+If you use the lower-level initializer directly, you can also provide a custom storage backend for temporary Solana data accounts used when submitting large Bitcoin proof payloads.

package/dist/index.d.ts

@@ -1,9 +1,78 @@
+/**
+ * # @atomiqlabs/chain-solana
+ *
+ * `@atomiqlabs/chain-solana` is the Solana integration package for the Atomiq protocol.
+ *
+ * Within the Atomiq stack, this library provides the Solana-side building blocks used for Bitcoin-aware swaps on Solana. It includes:
+ *
+ * - the `SolanaInitializer` used to register Solana support in the Atomiq SDK
+ * - the `SolanaChainInterface` used to talk to Solana RPCs
+ * - Solana BTC relay and swap program wrappers
+ * - signer and wallet helpers for Solana integrations
+ * - connection retry and chain event utilities
+ *
+ * This package is intended for direct protocol integrations and for higher-level Atomiq SDK layers that need Solana chain support.
+ *
+ * ## Installation
+ *
+ * Install the package with its `@solana/web3.js` peer dependency:
+ *
+ * ```bash
+ * npm install @atomiqlabs/chain-solana @solana/web3.js
+ * ```
+ *
+ * ## Supported Chains
+ *
+ * This package exports a single Solana initializer:
+ *
+ * - Solana via `SolanaInitializer`
+ *
+ * Canonical deployments currently defined in this package:
+ *
+ * | Chain | Canonical deployments included |
+ * | --- | --- |
+ * | Solana | `MAINNET`, `TESTNET` |
+ *
+ * In this package, the selected Bitcoin network determines which canonical Solana program addresses are used by default. `BitcoinNetwork.TESTNET4` is not wired to a Solana deployment here yet.
+ *
+ * The Solana implementation doesn't support the UTXO-controlled vault (SPV vault) contract, hence it can only process legacy HTLC & PrTLC based swaps.
+ *
+ * ## SDK Example
+ *
+ * Initialize the Atomiq SDK with Solana network support:
+ *
+ * ```ts
+ * import {SolanaInitializer} from "@atomiqlabs/chain-solana";
+ * import {BitcoinNetwork, SwapperFactory, TypedSwapper} from "@atomiqlabs/sdk";
+ *
+ * // Define chains that you want to support here
+ * const chains = [SolanaInitializer] as const;
+ * type SupportedChains = typeof chains;
+ *
+ * const Factory = new SwapperFactory<SupportedChains>(chains);
+ *
+ * const swapper: TypedSwapper<SupportedChains> = Factory.newSwapper({
+ *   chains: {
+ *     SOLANA: {
+ *       rpcUrl: solanaRpc // You can also pass a web3.js Connection object here
+ *     }
+ *   },
+ *   bitcoinNetwork: BitcoinNetwork.MAINNET // or BitcoinNetwork.TESTNET
+ * });
+ * ```
+ *
+ * If you use the lower-level initializer directly, you can also provide a custom storage backend for temporary Solana data accounts used when submitting large Bitcoin proof payloads.
+ *
+ * @packageDocumentation
+ */
 export { SolanaBtcHeader } from "./solana/btcrelay/headers/SolanaBtcHeader";
 export { SolanaBtcStoredHeader } from "./solana/btcrelay/headers/SolanaBtcStoredHeader";
 export * from "./solana/btcrelay/SolanaBtcRelay";
 export * from "./solana/chain/SolanaChainInterface";
 export * from "./solana/chain/modules/SolanaFees";
-export * from "./solana/events/SolanaChainEventsBrowser";
+export { SolanaTx, SignedSolanaTx } from "./solana/chain/modules/SolanaTransactions";
+export { ConnectionWithRetries } from "./solana/connection/ConnectionWithRetries";
+export { SolanaChainEventsBrowser, SolanaEventListenerState } from "./solana/events/SolanaChainEventsBrowser";
 export * from "./solana/swaps/SolanaSwapProgram";
 export { SolanaSwapData } from "./solana/swaps/SolanaSwapData";
 export * from "./solana/wallet/SolanaKeypairWallet";

package/dist/index.js

@@ -14,7 +14,74 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaSwapData = exports.SolanaBtcStoredHeader = exports.SolanaBtcHeader = void 0;
+exports.SolanaSwapData = exports.SolanaChainEventsBrowser = exports.ConnectionWithRetries = exports.SolanaBtcStoredHeader = exports.SolanaBtcHeader = void 0;
+/**
+ * # @atomiqlabs/chain-solana
+ *
+ * `@atomiqlabs/chain-solana` is the Solana integration package for the Atomiq protocol.
+ *
+ * Within the Atomiq stack, this library provides the Solana-side building blocks used for Bitcoin-aware swaps on Solana. It includes:
+ *
+ * - the `SolanaInitializer` used to register Solana support in the Atomiq SDK
+ * - the `SolanaChainInterface` used to talk to Solana RPCs
+ * - Solana BTC relay and swap program wrappers
+ * - signer and wallet helpers for Solana integrations
+ * - connection retry and chain event utilities
+ *
+ * This package is intended for direct protocol integrations and for higher-level Atomiq SDK layers that need Solana chain support.
+ *
+ * ## Installation
+ *
+ * Install the package with its `@solana/web3.js` peer dependency:
+ *
+ * ```bash
+ * npm install @atomiqlabs/chain-solana @solana/web3.js
+ * ```
+ *
+ * ## Supported Chains
+ *
+ * This package exports a single Solana initializer:
+ *
+ * - Solana via `SolanaInitializer`
+ *
+ * Canonical deployments currently defined in this package:
+ *
+ * | Chain | Canonical deployments included |
+ * | --- | --- |
+ * | Solana | `MAINNET`, `TESTNET` |
+ *
+ * In this package, the selected Bitcoin network determines which canonical Solana program addresses are used by default. `BitcoinNetwork.TESTNET4` is not wired to a Solana deployment here yet.
+ *
+ * The Solana implementation doesn't support the UTXO-controlled vault (SPV vault) contract, hence it can only process legacy HTLC & PrTLC based swaps.
+ *
+ * ## SDK Example
+ *
+ * Initialize the Atomiq SDK with Solana network support:
+ *
+ * ```ts
+ * import {SolanaInitializer} from "@atomiqlabs/chain-solana";
+ * import {BitcoinNetwork, SwapperFactory, TypedSwapper} from "@atomiqlabs/sdk";
+ *
+ * // Define chains that you want to support here
+ * const chains = [SolanaInitializer] as const;
+ * type SupportedChains = typeof chains;
+ *
+ * const Factory = new SwapperFactory<SupportedChains>(chains);
+ *
+ * const swapper: TypedSwapper<SupportedChains> = Factory.newSwapper({
+ *   chains: {
+ *     SOLANA: {
+ *       rpcUrl: solanaRpc // You can also pass a web3.js Connection object here
+ *     }
+ *   },
+ *   bitcoinNetwork: BitcoinNetwork.MAINNET // or BitcoinNetwork.TESTNET
+ * });
+ * ```
+ *
+ * If you use the lower-level initializer directly, you can also provide a custom storage backend for temporary Solana data accounts used when submitting large Bitcoin proof payloads.
+ *
+ * @packageDocumentation
+ */
 var SolanaBtcHeader_1 = require("./solana/btcrelay/headers/SolanaBtcHeader");
 Object.defineProperty(exports, "SolanaBtcHeader", { enumerable: true, get: function () { return SolanaBtcHeader_1.SolanaBtcHeader; } });
 var SolanaBtcStoredHeader_1 = require("./solana/btcrelay/headers/SolanaBtcStoredHeader");
@@ -22,7 +89,10 @@ Object.defineProperty(exports, "SolanaBtcStoredHeader", { enumerable: true, get:
 __exportStar(require("./solana/btcrelay/SolanaBtcRelay"), exports);
 __exportStar(require("./solana/chain/SolanaChainInterface"), exports);
 __exportStar(require("./solana/chain/modules/SolanaFees"), exports);
-__exportStar(require("./solana/events/SolanaChainEventsBrowser"), exports);
+var ConnectionWithRetries_1 = require("./solana/connection/ConnectionWithRetries");
+Object.defineProperty(exports, "ConnectionWithRetries", { enumerable: true, get: function () { return ConnectionWithRetries_1.ConnectionWithRetries; } });
+var SolanaChainEventsBrowser_1 = require("./solana/events/SolanaChainEventsBrowser");
+Object.defineProperty(exports, "SolanaChainEventsBrowser", { enumerable: true, get: function () { return SolanaChainEventsBrowser_1.SolanaChainEventsBrowser; } });
 __exportStar(require("./solana/swaps/SolanaSwapProgram"), exports);
 var SolanaSwapData_1 = require("./solana/swaps/SolanaSwapData");
 Object.defineProperty(exports, "SolanaSwapData", { enumerable: true, get: function () { return SolanaSwapData_1.SolanaSwapData; } });

package/dist/node/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Node.js-only entrypoint for filesystem-backed Solana helpers.
+ *
+ * Import from `@atomiqlabs/chain-solana/node` when you need runtime features
+ * that depend on Node's `fs` module.
+ *
+ * @packageDocumentation
+ */
+export { SolanaChainEvents } from "../solana/events/SolanaChainEvents";

package/dist/node/index.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaChainEvents = void 0;
+/**
+ * Node.js-only entrypoint for filesystem-backed Solana helpers.
+ *
+ * Import from `@atomiqlabs/chain-solana/node` when you need runtime features
+ * that depend on Node's `fs` module.
+ *
+ * @packageDocumentation
+ */
+var SolanaChainEvents_1 = require("../solana/events/SolanaChainEvents");
+Object.defineProperty(exports, "SolanaChainEvents", { enumerable: true, get: function () { return SolanaChainEvents_1.SolanaChainEvents; } });

package/dist/solana/SolanaInitializer.d.ts

@@ -14,25 +14,55 @@ export type SolanaAssetsType = BaseTokenType<"WBTC" | "USDC" | "USDT" | "SOL" |
  * @category Chain Interface
  */
 export type SolanaSwapperOptions = {
+    /**
+     * RPC url or {@link Connection} object to use for Solana network access
+     */
     rpcUrl: string | Connection;
+    /**
+     * Storage backend to use for storing ephemeral data submission accounts, i.e. accounts that are used
+     *  to submit large amount of data to an instruction that would otherwise be bigger than the transaction
+     *  size limit - used for submitting bitcoin transaction proofs for PrTLC swaps
+     */
     dataAccountStorage?: IStorageManager<StoredDataAccount>;
+    /**
+     * Retry policy to be used for Solana RPC calls and transaction submission
+     */
     retryPolicy?: SolanaRetryPolicy;
+    /**
+     * Optional Solana program address of the BTC Relay contract, uses the canonical deployment by default
+     */
     btcRelayContract?: string;
+    /**
+     * Optional Solana program address of the Swap contract, uses the canonical deployment by default
+     */
     swapContract?: string;
+    /**
+     * Solana fee API to use for fetching Solana network fees
+     */
     fees?: SolanaFees;
 };
 /**
  * Initialize Solana chain integration
+ *
+ * @param options Options for initializing the Solana chain
+ * @param bitcoinRpc Bitcoin RPC to use for bitcoin read access
+ * @param network Bitcoin network to use - determines Solana program addresses to use by default
+ * @param storageCtor Storage constructor used to create storage backend for ephemeral data submission accounts,
+ *  i.e. accounts that are used to submit large amount of data to an instruction that would otherwise be bigger
+ *  than the transaction size limit - used for submitting bitcoin transaction proofs for PrTLC swaps
+ *
  * @category Chain Interface
  */
 export declare function initializeSolana(options: SolanaSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork, storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>): ChainData<SolanaChainType>;
 /**
  * Type definition for the Solana chain initializer
+ *
  * @category Chain Interface
  */
 export type SolanaInitializerType = ChainInitializer<SolanaSwapperOptions, SolanaChainType, SolanaAssetsType>;
 /**
- * Solana chain initializer instance
+ * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
+ *
  * @category Chain Interface
  */
 export declare const SolanaInitializer: SolanaInitializerType;

package/dist/solana/SolanaInitializer.js

@@ -35,6 +35,14 @@ const SolanaAssets = {
 };
 /**
  * Initialize Solana chain integration
+ *
+ * @param options Options for initializing the Solana chain
+ * @param bitcoinRpc Bitcoin RPC to use for bitcoin read access
+ * @param network Bitcoin network to use - determines Solana program addresses to use by default
+ * @param storageCtor Storage constructor used to create storage backend for ephemeral data submission accounts,
+ *  i.e. accounts that are used to submit large amount of data to an instruction that would otherwise be bigger
+ *  than the transaction size limit - used for submitting bitcoin transaction proofs for PrTLC swaps
+ *
  * @category Chain Interface
  */
 function initializeSolana(options, bitcoinRpc, network, storageCtor) {
@@ -63,7 +71,8 @@ function initializeSolana(options, bitcoinRpc, network, storageCtor) {
 }
 exports.initializeSolana = initializeSolana;
 /**
- * Solana chain initializer instance
+ * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
+ *
  * @category Chain Interface
  */
 exports.SolanaInitializer = {

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

@@ -9,6 +9,8 @@ import { Buffer } from "buffer";
 import { SolanaSigner } from "../wallet/SolanaSigner";
 import { SolanaChainInterface } from "../chain/SolanaChainInterface";
 /**
+ * Solana BTC relay (bitcoin light client) program representation.
+ *
  * @category BTC Relay
  */
 export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> implements BtcRelay<SolanaBtcStoredHeader, {
@@ -38,14 +40,48 @@ export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBas
      * @param committedHeader
      */
     Verify(signer: PublicKey, reversedTxId: Buffer, confirmations: number, position: number, reversedMerkleProof: Buffer[], committedHeader: SolanaBtcStoredHeader): Promise<SolanaAction>;
-    CloseForkAccount(signer: PublicKey, forkId: number): Promise<SolanaAction>;
-    BtcRelayMainState: PublicKey;
-    BtcRelayHeader: (hash: Buffer) => PublicKey;
-    BtcRelayFork: (forkId: number, pubkey: PublicKey) => PublicKey;
-    bitcoinRpc: BitcoinRpc<B>;
+    /**
+     * Creates an action that closes a fork account and refunds rent to the signer.
+     *
+     * @param signer Signer paying and receiving rent refund
+     * @param forkId Fork account identifier to close
+     */
+    private CloseForkAccount;
+    /**
+     * PDA of the relay main state account.
+     */
+    private readonly BtcRelayMainState;
+    /**
+     * PDA helper for per-header topic accounts.
+     */
+    private readonly BtcRelayHeader;
+    /**
+     * PDA helper for fork state accounts.
+     */
+    private readonly BtcRelayFork;
+    /**
+     * Bitcoin RPC client used for bitcoin chain lookups.
+     *
+     * @internal
+     */
+    _bitcoinRpc: BitcoinRpc<B>;
+    /**
+     * @inheritDoc
+     */
     readonly maxHeadersPerTx: number;
+    /**
+     * @inheritDoc
+     */
     readonly maxForkHeadersPerTx: number;
+    /**
+     * @inheritDoc
+     */
     readonly maxShortForkHeadersPerTx: number;
+    /**
+     * @param chainInterface Underlying chain interface to use for the Solana chain operations
+     * @param bitcoinRpc Bitcoin RPC instance to use for read access to the bitcoin blockchain
+     * @param programAddress Optional Solana on-chain program address, defaults to the cannonical deployment
+     */
     constructor(chainInterface: SolanaChainInterface, bitcoinRpc: BitcoinRpc<B>, programAddress?: string);
     /**
      * Gets set of block commitments representing current main chain from the mainState
@@ -55,7 +91,7 @@ export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBas
      */
     private getBlockCommitmentsSet;
     /**
-     * Computes subsequent commited headers as they will appear on the blockchain when transactions
+     * Computes subsequent committed headers as they will appear on the blockchain when transactions
      *  are submitted & confirmed
      *
      * @param initialStoredHeader

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -10,6 +10,7 @@ const SolanaProgramBase_1 = require("../program/SolanaProgramBase");
 const SolanaAction_1 = require("../chain/SolanaAction");
 const buffer_1 = require("buffer");
 const BN = require("bn.js");
+const SolanaFees_1 = require("../chain/modules/SolanaFees");
 const MAX_CLOSE_IX_PER_TX = 10;
 function serializeBlockHeader(e) {
     return new SolanaBtcHeader_1.SolanaBtcHeader({
@@ -24,6 +25,8 @@ function serializeBlockHeader(e) {
 }
 ;
 /**
+ * Solana BTC relay (bitcoin light client) program representation.
+ *
  * @category BTC Relay
  */
 class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
@@ -38,12 +41,12 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     async Initialize(signer, header, epochStart, pastBlocksTimestamps) {
         const serializedBlock = serializeBlockHeader(header);
-        return new SolanaAction_1.SolanaAction(signer, this.Chain, 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,
             mainState: this.BtcRelayMainState,
-            headerTopic: this.BtcRelayHeader(serializedBlock.hash),
+            headerTopic: this.BtcRelayHeader(serializedBlock.getHash()),
             systemProgram: web3_js_1.SystemProgram.programId
         })
             .instruction(), 100000);
@@ -61,7 +64,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      * @param committedHeader
      */
     async Verify(signer, reversedTxId, confirmations, position, reversedMerkleProof, committedHeader) {
-        return new SolanaAction_1.SolanaAction(signer, this.Chain, 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,8 +72,14 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         })
             .instruction(), undefined, undefined, undefined, true);
     }
+    /**
+     * Creates an action that closes a fork account and refunds rent to the signer.
+     *
+     * @param signer Signer paying and receiving rent refund
+     * @param forkId Fork account identifier to close
+     */
     async CloseForkAccount(signer, forkId) {
-        return new SolanaAction_1.SolanaAction(signer, this.Chain, await this.program.methods
+        return new SolanaAction_1.SolanaAction(signer, this._Chain, await this.program.methods
             .closeForkAccount(new BN(forkId))
             .accounts({
             signer,
@@ -79,15 +88,38 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         })
             .instruction(), 20000);
     }
+    /**
+     * @param chainInterface Underlying chain interface to use for the Solana chain operations
+     * @param bitcoinRpc Bitcoin RPC instance to use for read access to the bitcoin blockchain
+     * @param programAddress Optional Solana on-chain program address, defaults to the cannonical deployment
+     */
     constructor(chainInterface, bitcoinRpc, programAddress) {
         super(chainInterface, programIdl, programAddress);
+        /**
+         * PDA of the relay main state account.
+         */
         this.BtcRelayMainState = this.pda("state");
+        /**
+         * PDA helper for per-header topic accounts.
+         */
         this.BtcRelayHeader = this.pda("header", (hash) => [hash]);
+        /**
+         * PDA helper for fork state accounts.
+         */
         this.BtcRelayFork = this.pda("fork", (forkId, pubkey) => [new BN(forkId).toArrayLike(buffer_1.Buffer, "le", 8), pubkey.toBuffer()]);
+        /**
+         * @inheritDoc
+         */
         this.maxHeadersPerTx = 5;
+        /**
+         * @inheritDoc
+         */
         this.maxForkHeadersPerTx = 4;
+        /**
+         * @inheritDoc
+         */
         this.maxShortForkHeadersPerTx = 4;
-        this.bitcoinRpc = bitcoinRpc;
+        this._bitcoinRpc = bitcoinRpc;
     }
     /**
      * Gets set of block commitments representing current main chain from the mainState
@@ -103,7 +135,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         return storedCommitments;
     }
     /**
-     * Computes subsequent commited headers as they will appear on the blockchain when transactions
+     * Computes subsequent committed headers as they will appear on the blockchain when transactions
      *  are submitted & confirmed
      *
      * @param initialStoredHeader
@@ -133,15 +165,15 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         const tx = await createTx(blockHeaderObj)
             .remainingAccounts(blockHeaderObj.map(e => {
             return {
-                pubkey: this.BtcRelayHeader(e.hash),
+                pubkey: this.BtcRelayHeader(e.getHash()),
                 isSigner: false,
                 isWritable: false
             };
         }))
             .transaction();
         tx.feePayer = signer;
-        this.Chain.Fees.applyFeeRateBegin(tx, null, feeRate);
-        this.Chain.Fees.applyFeeRateEnd(tx, null, feeRate);
+        SolanaFees_1.SolanaFees.applyFeeRateBegin(tx, null, feeRate);
+        SolanaFees_1.SolanaFees.applyFeeRateEnd(tx, null, feeRate);
         const computedCommitedHeaders = this.computeCommitedHeaders(storedHeader, blockHeaderObj);
         const lastStoredHeader = computedCommitedHeaders[computedCommitedHeaders.length - 1];
         return {
@@ -179,7 +211,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         const storedCommitments = this.getBlockCommitmentsSet(mainState);
         const blockHashBuffer = buffer_1.Buffer.from(blockData.blockhash, 'hex').reverse();
         const topicKey = this.BtcRelayHeader(blockHashBuffer);
-        const data = await this.Events.findInEvents(topicKey, async (event) => {
+        const data = await this._Events.findInEvents(topicKey, async (event) => {
             if (event.name === "StoreFork" || event.name === "StoreHeader") {
                 const eventData = event.data;
                 const commitHash = buffer_1.Buffer.from(eventData.commitHash).toString("hex");
@@ -202,7 +234,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
     async retrieveLogByCommitHash(commitmentHashStr, blockData) {
         const blockHashBuffer = buffer_1.Buffer.from(blockData.blockhash, "hex").reverse();
         const topicKey = this.BtcRelayHeader(blockHashBuffer);
-        const data = await this.Events.findInEvents(topicKey, async (event) => {
+        const data = await this._Events.findInEvents(topicKey, async (event) => {
             if (event.name === "StoreFork" || event.name === "StoreHeader") {
                 const eventData = event.data;
                 const commitHash = buffer_1.Buffer.from(eventData.commitHash).toString("hex");
@@ -212,7 +244,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         });
         if (data != null)
             this.logger.debug("retrieveLogByCommitHash(): block found," +
-                " commit hash: " + commitmentHashStr + " blockhash: " + blockData.blockhash + " height: " + data.blockheight);
+                " commit hash: " + commitmentHashStr + " blockhash: " + blockData.blockhash + " height: " + data.getBlockheight());
         return data;
     }
     /**
@@ -221,15 +253,15 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
     async retrieveLatestKnownBlockLog() {
         const mainState = await this.program.account.mainState.fetch(this.BtcRelayMainState);
         const storedCommitments = this.getBlockCommitmentsSet(mainState);
-        const data = await this.Events.findInEvents(this.program.programId, async (event) => {
+        const data = await this._Events.findInEvents(this.program.programId, async (event) => {
             if (event.name === "StoreFork" || event.name === "StoreHeader") {
                 const eventData = event.data;
                 const blockHashHex = buffer_1.Buffer.from(eventData.blockHash).reverse().toString("hex");
-                const isInMainChain = await this.bitcoinRpc.isInMainChain(blockHashHex).catch(() => false);
+                const isInMainChain = await this._bitcoinRpc.isInMainChain(blockHashHex).catch(() => false);
                 const commitHash = buffer_1.Buffer.from(eventData.commitHash).toString("hex");
                 //Check if this fork is part of main chain
                 if (isInMainChain && storedCommitments.has(commitHash)) {
-                    const blockHeader = await this.bitcoinRpc.getBlockHeader(blockHashHex);
+                    const blockHeader = await this._bitcoinRpc.getBlockHeader(blockHashHex);
                     if (blockHeader == null)
                         return null;
                     return {
@@ -243,7 +275,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
         if (data != null)
             this.logger.debug("retrieveLatestKnownBlockLog(): block found," +
                 " commit hash: " + data.commitHash + " blockhash: " + data.resultBitcoinHeader.getHash() +
-                " height: " + data.resultStoredHeader.blockheight);
+                " height: " + data.resultStoredHeader.getBlockheight());
         return data;
     }
     /**
@@ -289,7 +321,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             forkState: this.BtcRelayFork(forkId.toNumber(), _signer),
             systemProgram: web3_js_1.SystemProgram.programId,
         }));
-        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(buffer_1.Buffer.from(result.lastStoredHeader.chainWork), tipWork)) {
+        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
             //Fork's work is higher than main chain's work, this fork will become a main chain
             result.forkId = 0;
         }
@@ -311,7 +343,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             forkState: this.BtcRelayFork(forkId, _signer),
             systemProgram: web3_js_1.SystemProgram.programId,
         }));
-        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(buffer_1.Buffer.from(result.lastStoredHeader.chainWork), tipWork)) {
+        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
             //Fork's work is higher than main chain's work, this fork will become a main chain
             result.forkId = 0;
         }
@@ -331,7 +363,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             signer: _signer,
             mainState: this.BtcRelayMainState
         }));
-        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(buffer_1.Buffer.from(result.lastStoredHeader.chainWork), tipWork)) {
+        if (result.forkId !== 0 && base_1.StatePredictorUtils.gtBuffer(result.lastStoredHeader.getChainWork(), tipWork)) {
             //Fork's work is higher than main chain's work, this fork will become a main chain
             result.forkId = 0;
         }
@@ -344,7 +376,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.Chain);
+        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;
@@ -356,14 +388,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.Chain);
+                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.Chain.sendAndConfirm(signer, txs, true);
+            const signatures = await this._Chain.sendAndConfirm(signer, txs, true);
             this.logger.info("sweepForkData(): forks swept, signatures: " + signatures.join());
         }
         return lastCheckedId ?? null;
@@ -397,7 +429,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     getMainFeeRate(signer) {
         const _signer = signer == null ? null : new web3_js_1.PublicKey(signer);
-        return this.Chain.Fees.getFeeRate(_signer == null ? [this.BtcRelayMainState] : [
+        return this._Chain.Fees.getFeeRate(_signer == null ? [this.BtcRelayMainState] : [
             _signer,
             this.BtcRelayMainState
         ]);
@@ -407,7 +439,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     getForkFeeRate(signer, forkId) {
         const _signer = new web3_js_1.PublicKey(signer);
-        return this.Chain.Fees.getFeeRate([
+        return this._Chain.Fees.getFeeRate([
             _signer,
             this.BtcRelayMainState,
             this.BtcRelayFork(forkId, _signer)