@atomiqlabs/chain-solana 13.4.1 → 13.5.6

package/dist/index.d.ts

@@ -42,11 +42,11 @@
  * Initialize the Atomiq SDK with Solana network support:
  *
  * ```ts
- * import {SolanaInitializer} from "@atomiqlabs/chain-solana";
+ * import {SolanaInitializerV2} from "@atomiqlabs/chain-solana";
  * import {BitcoinNetwork, SwapperFactory, TypedSwapper} from "@atomiqlabs/sdk";
  *
  * // Define chains that you want to support here
- * const chains = [SolanaInitializer] as const;
+ * const chains = [SolanaInitializerV2] as const;
  * type SupportedChains = typeof chains;
  *
  * const Factory = new SwapperFactory<SupportedChains>(chains);

package/dist/index.js

@@ -59,11 +59,11 @@ exports.SolanaSwapData = exports.SolanaChainEventsBrowser = exports.ConnectionWi
  * Initialize the Atomiq SDK with Solana network support:
  *
  * ```ts
- * import {SolanaInitializer} from "@atomiqlabs/chain-solana";
+ * import {SolanaInitializerV2} from "@atomiqlabs/chain-solana";
  * import {BitcoinNetwork, SwapperFactory, TypedSwapper} from "@atomiqlabs/sdk";
  *
  * // Define chains that you want to support here
- * const chains = [SolanaInitializer] as const;
+ * const chains = [SolanaInitializerV2] as const;
  * type SupportedChains = typeof chains;
  *
  * const Factory = new SwapperFactory<SupportedChains>(chains);

package/dist/solana/SolanaChainType.d.ts

@@ -12,4 +12,4 @@ import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
  * Type definition for the Solana chain implementation
  * @category Chain Interface
  */
-export type SolanaChainType = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SignedSolanaTx, SolanaSigner, Wallet, SolanaSwapData, SolanaSwapProgram, SolanaChainInterface, SolanaChainEventsBrowser, SolanaBtcRelay<any>, never, never, never>;
+export type SolanaChainType<Version extends "v1" | "v2" = "v1"> = ChainType<"SOLANA", SolanaPreFetchData, SolanaPreFetchVerification, SolanaTx, SignedSolanaTx, SolanaSigner, Wallet, SolanaSwapData, SolanaSwapProgram<Version>, SolanaChainInterface, SolanaChainEventsBrowser, SolanaBtcRelay<any>, never, never, never>;

package/dist/solana/SolanaChains.d.ts

@@ -2,8 +2,10 @@ import { BitcoinNetwork } from "@atomiqlabs/base";
 export declare const SolanaChains: {
     [key in BitcoinNetwork]?: {
         addresses: {
-            swapContract: string;
-            btcRelayContract: string;
+            [version in "v1" | "v2"]?: {
+                swapContract: string;
+                btcRelayContract: string;
+            };
         };
         clusterName: "mainnet-beta" | "devnet" | "testnet";
     };

package/dist/solana/SolanaChains.js

@@ -3,24 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaChains = void 0;
 const base_1 = require("@atomiqlabs/base");
 exports.SolanaChains = {
-    //TODO: Not deployed yet
-    // [BitcoinNetwork.TESTNET4]: {
-    //     addresses: {
-    //         swapContract: "11111111111111111111111111111111",
-    //         btcRelayContract: "11111111111111111111111111111111"
-    //     }
-    // },
+    [base_1.BitcoinNetwork.TESTNET4]: {
+        addresses: {
+            v1: {
+                swapContract: "7g6iDybm7XiiPidYwQ5DbuCREro39St52Xn7V3NV2EE4",
+                btcRelayContract: "CBYz9cgBG6v8kF19jhLk46gPRhY858NV1MfngzGzwgdX"
+            },
+            v2: {
+                swapContract: "8YiqJKjuS7zKPYoxdMFsfPpavPYCnu13Yx1CFqgV6o43",
+                btcRelayContract: "HKKJKW1jWh3DZptNSABZ4iKUvjxYvic4tb3qnqNvBZoF"
+            }
+        },
+        clusterName: "devnet"
+    },
     [base_1.BitcoinNetwork.TESTNET]: {
         addresses: {
-            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
-            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            v1: {
+                swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+                btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            }
         },
         clusterName: "devnet"
     },
     [base_1.BitcoinNetwork.MAINNET]: {
         addresses: {
-            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
-            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            v1: {
+                swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+                btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            }
         },
         clusterName: "mainnet-beta"
     }

package/dist/solana/SolanaInitializer.d.ts

@@ -42,7 +42,7 @@ export type SolanaSwapperOptions = {
     fees?: SolanaFees;
 };
 /**
- * Initialize Solana chain integration
+ * Initialize Solana chain integration using the v1 as the default version of the contracts
  *
  * @param options Options for initializing the Solana chain
  * @param bitcoinRpc Bitcoin RPC to use for bitcoin read access
@@ -53,16 +53,42 @@ export type SolanaSwapperOptions = {
  *
  * @category Chain Interface
  */
-export declare function initializeSolana(options: SolanaSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork, storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>): ChainData<SolanaChainType>;
+export declare function initializeSolana(options: SolanaSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork, storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>): ChainData<SolanaChainType<"v1">>;
+/**
+ * Initialize Solana chain integration using the new v2 version as the default version of the contracts
+ *
+ * @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 initializeSolanaV2(options: SolanaSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork, storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>): ChainData<SolanaChainType<"v2">>;
 /**
  * Type definition for the Solana chain initializer
  *
  * @category Chain Interface
  */
-export type SolanaInitializerType = ChainInitializer<SolanaSwapperOptions, SolanaChainType, SolanaAssetsType>;
+export type SolanaInitializerType<Version extends "v1" | "v2" = "v1"> = ChainInitializer<SolanaSwapperOptions, SolanaChainType<Version>, SolanaAssetsType>;
 /**
  * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
  *
+ * Uses the legacy v1 version of the contract as the default exported version, this doesn't support the new
+ *  v2 lightning network flow, use the {@link SolanaInitializerV2} to initialize the SDK with the v2
+ *  contracts as the default, which do have an explicit support for new lightning network swap flow
+ *
+ * @category Chain Interface
+ */
+export declare const SolanaInitializer: SolanaInitializerType<"v1">;
+/**
+ * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
+ *
+ * Uses the new v2 version of the contracts as default exported version, supported the new lightning network
+ *  swap flow.
+ *
  * @category Chain Interface
  */
-export declare const SolanaInitializer: SolanaInitializerType;
+export declare const SolanaInitializerV2: SolanaInitializerType<"v2">;

package/dist/solana/SolanaInitializer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaInitializer = exports.initializeSolana = void 0;
+exports.SolanaInitializerV2 = exports.SolanaInitializer = exports.initializeSolanaV2 = exports.initializeSolana = void 0;
 const base_1 = require("@atomiqlabs/base");
 const web3_js_1 = require("@solana/web3.js");
 const SolanaChainInterface_1 = require("./chain/SolanaChainInterface");
@@ -36,6 +36,7 @@ const SolanaAssets = {
 /**
  * Initialize Solana chain integration
  *
+ * @param version
  * @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
@@ -45,34 +46,108 @@ const SolanaAssets = {
  *
  * @category Chain Interface
  */
-function initializeSolana(options, bitcoinRpc, network, storageCtor) {
+function _initializeSolana(version, options, bitcoinRpc, network, storageCtor) {
     const connection = typeof (options.rpcUrl) === "string" ?
         new web3_js_1.Connection(options.rpcUrl) :
         options.rpcUrl;
-    const solanaChainData = SolanaChains_1.SolanaChains[network];
-    if (solanaChainData == null)
-        throw new Error(`Unsupported bitcoin network for Solana: ${base_1.BitcoinNetwork[network]}`);
     const Fees = options.fees ?? new SolanaFees_1.SolanaFees(connection, 200000, 4, 100);
     const chainInterface = new SolanaChainInterface_1.SolanaChainInterface(connection, options.retryPolicy ?? { transactionResendInterval: 1000 }, Fees);
-    const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(chainInterface, bitcoinRpc, options.btcRelayContract ?? solanaChainData.addresses.btcRelayContract);
-    const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(chainInterface, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), options.swapContract ?? solanaChainData.addresses.swapContract);
-    const chainEvents = new SolanaChainEventsBrowser_1.SolanaChainEventsBrowser(connection, swapContract);
+    const versionedContracts = {};
+    if (options.btcRelayContract || options.swapContract) {
+        // Initialize only that version
+        const btcRelayContractAddress = options.btcRelayContract ?? SolanaChains_1.SolanaChains[network]?.addresses[version]?.btcRelayContract;
+        const swapContractAddress = options.swapContract ?? SolanaChains_1.SolanaChains[network]?.addresses[version]?.swapContract;
+        if (btcRelayContractAddress == null)
+            throw new Error(`Unsupported bitcoin network for Solana, using default version ${version}: ${base_1.BitcoinNetwork[network]}, please pass a custom deployment btc relay program address!`);
+        if (swapContractAddress == null)
+            throw new Error(`Unsupported bitcoin network for Solana, using default version ${version}: ${base_1.BitcoinNetwork[network]}, please pass a custom deployment swap program address!`);
+        const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(chainInterface, bitcoinRpc, btcRelayContractAddress);
+        const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(chainInterface, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), swapContractAddress, network, version);
+        versionedContracts[version] = {
+            btcRelay,
+            swapContract: swapContract,
+            swapDataConstructor: version === "v1" ? SolanaSwapData_1.SolanaSwapDataV1 : SolanaSwapData_1.SolanaSwapDataV2,
+            spvVaultContract: null,
+            spvVaultDataConstructor: null,
+            spvVaultWithdrawalDataConstructor: null
+        };
+    }
+    else {
+        // Initialize all versions
+        const solanaChainData = SolanaChains_1.SolanaChains[network];
+        if (solanaChainData == null)
+            throw new Error(`Unsupported bitcoin network for Solana: ${base_1.BitcoinNetwork[network]}, please pass a custom deployment program addresses!`);
+        for (let _version in solanaChainData.addresses) {
+            const version = _version;
+            const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(chainInterface, bitcoinRpc, solanaChainData.addresses[version].btcRelayContract);
+            const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(chainInterface, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), solanaChainData.addresses[version].swapContract, network, version);
+            versionedContracts[version] = {
+                btcRelay,
+                swapContract: swapContract,
+                swapDataConstructor: version === "v1" ? SolanaSwapData_1.SolanaSwapDataV1 : SolanaSwapData_1.SolanaSwapDataV2,
+                spvVaultContract: null,
+                spvVaultDataConstructor: null,
+                spvVaultWithdrawalDataConstructor: null
+            };
+        }
+    }
+    const chainEvents = new SolanaChainEventsBrowser_1.SolanaChainEventsBrowser(connection, versionedContracts);
+    const defaults = versionedContracts[version];
+    if (defaults == null)
+        throw new Error(`Unsupported bitcoin network for Solana, using default version ${version}: ${base_1.BitcoinNetwork[network]}, please pass a custom deployment program addresses!`);
     return {
         chainId,
-        btcRelay,
-        swapContract,
-        chainEvents,
-        swapDataConstructor: SolanaSwapData_1.SolanaSwapData,
         chainInterface,
-        spvVaultContract: null,
-        spvVaultDataConstructor: null,
-        spvVaultWithdrawalDataConstructor: null
+        btcRelay: defaults.btcRelay,
+        swapContract: defaults.swapContract,
+        chainEvents,
+        swapDataConstructor: defaults.swapDataConstructor,
+        spvVaultContract: defaults.spvVaultContract,
+        spvVaultDataConstructor: defaults.spvVaultDataConstructor,
+        spvVaultWithdrawalDataConstructor: defaults.spvVaultWithdrawalDataConstructor,
+        defaultVersion: version,
+        versions: versionedContracts
     };
 }
+/**
+ * Initialize Solana chain integration using the v1 as the default version of the contracts
+ *
+ * @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) {
+    return _initializeSolana("v1", options, bitcoinRpc, network, storageCtor);
+}
 exports.initializeSolana = initializeSolana;
+/**
+ * Initialize Solana chain integration using the new v2 version as the default version of the contracts
+ *
+ * @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 initializeSolanaV2(options, bitcoinRpc, network, storageCtor) {
+    return _initializeSolana("v2", options, bitcoinRpc, network, storageCtor);
+}
+exports.initializeSolanaV2 = initializeSolanaV2;
 /**
  * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
  *
+ * Uses the legacy v1 version of the contract as the default exported version, this doesn't support the new
+ *  v2 lightning network flow, use the {@link SolanaInitializerV2} to initialize the SDK with the v2
+ *  contracts as the default, which do have an explicit support for new lightning network swap flow
+ *
  * @category Chain Interface
  */
 exports.SolanaInitializer = {
@@ -82,3 +157,18 @@ exports.SolanaInitializer = {
     tokens: SolanaAssets,
     options: null
 };
+/**
+ * Solana chain initializer instance, used in the SwapperFactory constructor in the SDK library
+ *
+ * Uses the new v2 version of the contracts as default exported version, supported the new lightning network
+ *  swap flow.
+ *
+ * @category Chain Interface
+ */
+exports.SolanaInitializerV2 = {
+    chainId,
+    chainType: null,
+    initializer: initializeSolanaV2,
+    tokens: SolanaAssets,
+    options: null
+};

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

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { PublicKey, Signer, Transaction } from "@solana/web3.js";
 import { SolanaBtcStoredHeader } from "./headers/SolanaBtcStoredHeader";
-import { BitcoinRpc, BtcBlock, BtcRelay } from "@atomiqlabs/base";
+import { BitcoinNetwork, BitcoinRpc, BtcBlock, BtcRelay } from "@atomiqlabs/base";
 import { SolanaProgramBase } from "../program/SolanaProgramBase";
 import { SolanaAction } from "../chain/SolanaAction";
 import { Buffer } from "buffer";
@@ -81,8 +81,10 @@ export declare class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBas
      * @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
+     * @param bitcoinNetwork
+     * @param contractVersion
      */
-    constructor(chainInterface: SolanaChainInterface, bitcoinRpc: BitcoinRpc<B>, programAddress?: string);
+    constructor(chainInterface: SolanaChainInterface, bitcoinRpc: BitcoinRpc<B>, programAddress?: string, bitcoinNetwork?: BitcoinNetwork, contractVersion?: "v1" | "v2");
     /**
      * Gets set of block commitments representing current main chain from the mainState
      *

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -11,6 +11,7 @@ const SolanaAction_1 = require("../chain/SolanaAction");
 const buffer_1 = require("buffer");
 const BN = require("bn.js");
 const SolanaFees_1 = require("../chain/modules/SolanaFees");
+const SolanaChains_1 = require("../SolanaChains");
 const MAX_CLOSE_IX_PER_TX = 10;
 function serializeBlockHeader(e) {
     return new SolanaBtcHeader_1.SolanaBtcHeader({
@@ -92,8 +93,13 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      * @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
+     * @param bitcoinNetwork
+     * @param contractVersion
      */
-    constructor(chainInterface, bitcoinRpc, programAddress) {
+    constructor(chainInterface, bitcoinRpc, programAddress, bitcoinNetwork, contractVersion) {
+        if (bitcoinNetwork != null && programAddress == null) {
+            programAddress = SolanaChains_1.SolanaChains[bitcoinNetwork]?.addresses[contractVersion ?? "v1"]?.btcRelayContract;
+        }
         super(chainInterface, programIdl, programAddress);
         /**
          * PDA of the relay main state account.

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

@@ -13,7 +13,7 @@ export declare class SolanaAction {
     private estimateFee;
     addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]): void;
     add(action: SolanaAction): this;
-    addAction(action: SolanaAction, index?: number): this;
+    addAction(action: SolanaAction, index?: number, noSignerCheck?: boolean): this;
     tx(feeRate?: string, block?: {
         blockhash: string;
         blockHeight: number;

package/dist/solana/chain/SolanaAction.js

@@ -33,7 +33,7 @@ class SolanaAction {
     add(action) {
         return this.addAction(action);
     }
-    addAction(action, index = this.instructions.length) {
+    addAction(action, index = this.instructions.length, noSignerCheck) {
         if (action.firstIxBeforeComputeBudget) {
             if (this.instructions.length > 0)
                 throw new Error("Tried to add firstIxBeforeComputeBudget action to existing action with instructions");
@@ -41,7 +41,7 @@ class SolanaAction {
         }
         if (this.firstIxBeforeComputeBudget && this.instructions.length > 0 && index === 0)
             throw new Error("Tried adding to firstIxBeforeComputeBudget action on 0th index");
-        if (!action.mainSigner.equals(this.mainSigner))
+        if (!noSignerCheck && !action.mainSigner.equals(this.mainSigner))
             throw new Error("Actions need to have the same signer!");
         if (this.computeBudget == null && action.computeBudget != null)
             this.computeBudget = action.computeBudget;

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

@@ -153,6 +153,10 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, Si
      * @inheritDoc
      */
     deserializeSignedTx(txData: string): Promise<Transaction>;
+    /**
+     * @inheritDoc
+     */
+    getTxId(signedTX: SignedSolanaTx): Promise<string>;
     /**
      * @inheritDoc
      */

package/dist/solana/chain/SolanaChainInterface.js

@@ -15,6 +15,8 @@ const SolanaAddresses_1 = require("./modules/SolanaAddresses");
 const SolanaSigner_1 = require("../wallet/SolanaSigner");
 const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
 const SolanaChains_1 = require("../SolanaChains");
+// @ts-ignore
+const bs58 = require("bs58");
 const CLUSTER_BY_GENESIS_HASH = {
     "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d": "mainnet-beta",
     "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG": "devnet",
@@ -147,6 +149,12 @@ class SolanaChainInterface {
     deserializeSignedTx(txData) {
         return Promise.resolve(this.Transactions.deserializeSignedTransaction(txData));
     }
+    /**
+     * @inheritDoc
+     */
+    getTxId(signedTX) {
+        return Promise.resolve(bs58.encode(signedTX.signature));
+    }
     /**
      * @inheritDoc
      */

package/dist/solana/events/SolanaChainEvents.d.ts

@@ -10,7 +10,11 @@ export declare class SolanaChainEvents extends SolanaChainEventsBrowser {
     private readonly logFetchInterval;
     private stopped;
     private timeout?;
-    constructor(directory: string, connection: Connection, solanaSwapProgram: SolanaSwapProgram, logFetchInterval?: number);
+    constructor(directory: string, connection: Connection, contractVersions: SolanaSwapProgram | {
+        [version: string]: {
+            swapContract: SolanaSwapProgram;
+        };
+    }, logFetchInterval?: number);
     /**
      * Retrieves last signature & slot from filesystem
      *

package/dist/solana/events/SolanaChainEvents.js

@@ -10,8 +10,8 @@ const LOG_FETCH_INTERVAL = 5 * 1000;
  *  any events
  */
 class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrowser {
-    constructor(directory, connection, solanaSwapProgram, logFetchInterval) {
-        super(connection, solanaSwapProgram);
+    constructor(directory, connection, contractVersions, logFetchInterval) {
+        super(connection, contractVersions);
         this.stopped = true;
         this.directory = directory;
         this.logFetchInterval = logFetchInterval || LOG_FETCH_INTERVAL;
@@ -22,8 +22,18 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
      * @private
      */
     async getLastSignature() {
+        let txt;
+        try {
+            txt = (await fs.readFile(this.directory + BLOCKHEIGHT_FILENAME)).toString();
+        }
+        catch (e) {
+            return null;
+        }
+        try {
+            return JSON.parse(txt);
+        }
+        catch (e) { }
         try {
-            const txt = (await fs.readFile(this.directory + BLOCKHEIGHT_FILENAME)).toString();
             const arr = txt.split(";");
             if (arr.length < 2)
                 return {
@@ -44,8 +54,8 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
      *
      * @private
      */
-    saveLastSignature(lastSignature, slot) {
-        return fs.writeFile(this.directory + BLOCKHEIGHT_FILENAME, lastSignature + ";" + slot);
+    saveLastSignature(lastState) {
+        return fs.writeFile(this.directory + BLOCKHEIGHT_FILENAME, JSON.stringify(lastState));
     }
     /**
      * Polls for new events & processes them
@@ -56,7 +66,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
         const lastSignature = await this.getLastSignature();
         const result = await this.poll(lastSignature ?? undefined);
         if (result != null) {
-            await this.saveLastSignature(result.signature, result.slot);
+            await this.saveLastSignature(result);
         }
     }
     async setupHttpPolling() {

package/dist/solana/events/SolanaChainEventsBrowser.d.ts

@@ -4,7 +4,7 @@ import { IdlEvents } from "@coral-xyz/anchor";
 import { SolanaSwapProgram } from "../swaps/SolanaSwapProgram";
 import { Connection } from "@solana/web3.js";
 import { InstructionWithAccounts, ProgramEvent } from "../program/modules/SolanaProgramEvents";
-import { SwapProgram } from "../swaps/programTypes";
+import { SwapProgram } from "../swaps/v1/programTypes";
 /**
  * Parsed event payload grouped by originating transaction metadata.
  *
@@ -17,11 +17,11 @@ export type EventObject = {
     signature: string;
 };
 /**
- * Current cursor of Solana event listener state.
+ * Legacy current cursor of Solana event listener state.
  *
  * @category Events
  */
-export type SolanaEventListenerState = {
+export type SolanaLegacyEventListenerState = {
     /**
      * Last processed transaction's signature
      */
@@ -31,6 +31,14 @@ export type SolanaEventListenerState = {
      */
     slot: number;
 };
+/**
+ * Current cursor of Solana event listener state.
+ *
+ * @category Events
+ */
+export type SolanaEventListenerState = {
+    [version: string]: SolanaLegacyEventListenerState | null;
+};
 /**
  * Solana on-chain event handler for front-end systems without access to fs, uses pure WS to subscribe, might lose
  *  out on some events if the network is unreliable, front-end systems should take this into consideration and not
@@ -38,7 +46,7 @@ export type SolanaEventListenerState = {
  *
  * @category Events
  */
-export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapData, SolanaEventListenerState> {
+export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapData, SolanaLegacyEventListenerState | SolanaEventListenerState> {
     /**
      * @internal
      */
@@ -50,11 +58,17 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
     /**
      * @internal
      */
-    protected readonly solanaSwapProgram: SolanaSwapProgram;
+    protected readonly contractVersions: {
+        [version: string]: {
+            swapContract: SolanaSwapProgram;
+        };
+    };
     /**
      * @internal
      */
-    protected eventListeners: number[];
+    protected eventListeners: {
+        [version: string]: number[];
+    };
     /**
      * @internal
      */
@@ -62,21 +76,24 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
         debug: (msg: string, ...args: any[]) => false | void;
         info: (msg: string, ...args: any[]) => false | void;
         warn: (msg: string, ...args: any[]) => false | void;
-        error: (msg: string, ...args: any[]) => false | void; /**
-         * @internal
-         */
+        error: (msg: string, ...args: any[]) => false | void;
     };
     private readonly logFetchLimit;
     private signaturesProcessing;
     private processedSignatures;
     private processedSignaturesIndex;
-    constructor(connection: Connection, solanaSwapContract: SolanaSwapProgram, logFetchLimit?: number);
+    constructor(connection: Connection, contractVersions: SolanaSwapProgram | {
+        [version: string]: {
+            swapContract: SolanaSwapProgram;
+        };
+    }, logFetchLimit?: number);
     private addProcessedSignature;
     private isSignatureProcessed;
     /**
      * Parses EventObject from the transaction
      *
      * @param transaction
+     * @param version
      * @private
      * @returns {EventObject} parsed event object
      */
@@ -85,6 +102,7 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
      * Fetches transaction from the RPC, parses it to even object & processes it through event handler
      *
      * @param signature
+     * @param version
      * @private
      * @returns {boolean} whether the operation was successful
      */
@@ -101,6 +119,7 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
      *
      * @param eventObject
      * @param txoHash
+     * @param version
      * @private
      * @returns {() => Promise<SolanaSwapData>} getter to be passed to InitializeEvent constructor
      */
@@ -108,30 +127,32 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
     /**
      * @internal
      */
-    protected parseInitializeEvent(data: IdlEvents<SwapProgram>["InitializeEvent"], eventObject: EventObject): InitializeEvent<SolanaSwapData>;
+    protected parseInitializeEvent(data: IdlEvents<SwapProgram>["InitializeEvent"], eventObject: EventObject, version: string): InitializeEvent<SolanaSwapData>;
     /**
      * @internal
      */
-    protected parseRefundEvent(data: IdlEvents<SwapProgram>["RefundEvent"]): RefundEvent<SolanaSwapData>;
+    protected parseRefundEvent(data: IdlEvents<SwapProgram>["RefundEvent"], version: string): RefundEvent<SolanaSwapData>;
     /**
      * @internal
      */
-    protected parseClaimEvent(data: IdlEvents<SwapProgram>["ClaimEvent"]): ClaimEvent<SolanaSwapData>;
+    protected parseClaimEvent(data: IdlEvents<SwapProgram>["ClaimEvent"], version: string): ClaimEvent<SolanaSwapData>;
     /**
      * Processes event as received from the chain, parses it & calls event listeners
      *
      * @param eventObject
+     * @param version
      * @internal
      */
-    protected processEvent(eventObject: EventObject): Promise<void>;
+    protected processEvent(eventObject: EventObject, version: string): Promise<void>;
     /**
      * Returns websocket event handler for specific event type
      *
      * @param name
+     * @param version
      * @internal
      * @returns event handler to be passed to program's addEventListener function
      */
-    protected getWsEventHandler<E extends "InitializeEvent" | "RefundEvent" | "ClaimEvent">(name: E): (data: IdlEvents<SwapProgram>[E], slotNumber: number, signature: string) => void;
+    protected getWsEventHandler<E extends "InitializeEvent" | "RefundEvent" | "ClaimEvent">(name: E, version: string): (data: IdlEvents<SwapProgram>[E], slotNumber: number, signature: string) => void;
     /**
      * Sets up event handlers listening for swap events over websocket
      *
@@ -142,6 +163,7 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
      * Gets all the new signatures from the last processed signature
      *
      * @param lastProcessedSignature
+     * @param version
      * @private
      */
     private getNewSignatures;
@@ -155,6 +177,7 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
      * Processes signatures, fetches transactions & processes event through event handlers
      *
      * @param signatures
+     * @param version
      * @private
      * @returns {Promise<{signature: string, slot: number}>} latest processed transaction signature and slot height
      */
@@ -162,7 +185,7 @@ export declare class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapD
     /**
      * @inheritDoc
      */
-    poll(lastSignature?: SolanaEventListenerState): Promise<SolanaEventListenerState | null>;
+    poll(lastSignature?: SolanaLegacyEventListenerState | SolanaEventListenerState): Promise<SolanaEventListenerState>;
     /**
      * @inheritDoc
      */