@atomiqlabs/chain-solana 13.3.0 → 13.4.1

package/dist/solana/SolanaChains.d.ts

@@ -5,5 +5,6 @@ export declare const SolanaChains: {
             swapContract: string;
             btcRelayContract: string;
         };
+        clusterName: "mainnet-beta" | "devnet" | "testnet";
     };
 };

package/dist/solana/SolanaChains.js

@@ -14,12 +14,14 @@ exports.SolanaChains = {
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
             btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
+        },
+        clusterName: "devnet"
     },
     [base_1.BitcoinNetwork.MAINNET]: {
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
             btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
+        },
+        clusterName: "mainnet-beta"
     }
 };

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

@@ -8,7 +8,7 @@ import { SolanaTokens } from "./modules/SolanaTokens";
 import { SignedSolanaTx, SolanaTransactions, SolanaTx } from "./modules/SolanaTransactions";
 import { SolanaSignatures } from "./modules/SolanaSignatures";
 import { SolanaEvents } from "./modules/SolanaEvents";
-import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
+import { BitcoinNetwork, ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
 import { SolanaSigner } from "../wallet/SolanaSigner";
 import { Buffer } from "buffer";
 import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
@@ -212,4 +212,5 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, Si
      * @inheritDoc
      */
     wrapSigner(signer: Wallet): Promise<SolanaSigner>;
+    verifyNetwork(bitcoinNetwork: BitcoinNetwork): Promise<void>;
 }

package/dist/solana/chain/SolanaChainInterface.js

@@ -10,9 +10,16 @@ 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 base_1 = require("@atomiqlabs/base");
 const SolanaAddresses_1 = require("./modules/SolanaAddresses");
 const SolanaSigner_1 = require("../wallet/SolanaSigner");
 const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
+const SolanaChains_1 = require("../SolanaChains");
+const CLUSTER_BY_GENESIS_HASH = {
+    "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d": "mainnet-beta",
+    "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG": "devnet",
+    "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY": "testnet",
+};
 /**
  * Main chain interface for interacting with Solana blockchain
  * @category Chain Interface
@@ -234,5 +241,20 @@ class SolanaChainInterface {
     wrapSigner(signer) {
         return Promise.resolve(new SolanaSigner_1.SolanaSigner(signer));
     }
+    async verifyNetwork(bitcoinNetwork) {
+        const genesisHash = await this._connection.getGenesisHash();
+        const result = CLUSTER_BY_GENESIS_HASH[genesisHash];
+        if (result == null) {
+            this.logger.warn(`verifyNetwork(): Unknown cluster detected, genesis hash: ${genesisHash}`);
+            return;
+        }
+        const deployment = SolanaChains_1.SolanaChains[bitcoinNetwork];
+        if (deployment == null) {
+            this.logger.warn(`verifyNetwork(): No Solana deployment is defined for ${base_1.BitcoinNetwork[bitcoinNetwork]}, the RPC check is skipped.`);
+            return;
+        }
+        if (deployment.clusterName !== result)
+            throw new Error(`Expected ${deployment.clusterName} Solana cluster for ${base_1.BitcoinNetwork[bitcoinNetwork]}, but got ${result}!`);
+    }
 }
 exports.SolanaChainInterface = SolanaChainInterface;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "13.3.0",
+  "version": "13.4.1",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -26,7 +26,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^13.3.0",
+    "@atomiqlabs/base": "^13.4.0",
     "@coral-xyz/anchor": "0.29.0",
     "@noble/hashes": "^1.7.1",
     "@solana/spl-token": "0.4.14",

package/src/solana/SolanaChains.ts

@@ -1,6 +1,9 @@
 import {BitcoinNetwork} from "@atomiqlabs/base";
 
-export const SolanaChains: {[key in BitcoinNetwork]?: {addresses: {swapContract: string, btcRelayContract: string}}} = {
+export const SolanaChains: {[key in BitcoinNetwork]?: {
+    addresses: {swapContract: string, btcRelayContract: string}
+    clusterName: "mainnet-beta" | "devnet" | "testnet"
+}} = {
     //TODO: Not deployed yet
     // [BitcoinNetwork.TESTNET4]: {
     //     addresses: {
@@ -12,12 +15,14 @@ export const SolanaChains: {[key in BitcoinNetwork]?: {addresses: {swapContract:
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
             btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
+        },
+        clusterName: "devnet"
     },
     [BitcoinNetwork.MAINNET]: {
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
             btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
+        },
+        clusterName: "mainnet-beta"
     }
 } as const;

package/src/solana/chain/SolanaChainInterface.ts

@@ -7,12 +7,19 @@ import {SignedSolanaTx, SolanaTransactions, SolanaTx} from "./modules/SolanaTran
 import {SolanaSignatures} from "./modules/SolanaSignatures";
 import {SolanaEvents} from "./modules/SolanaEvents";
 import {getLogger} from "../../utils/Utils";
-import {ChainInterface, TransactionConfirmationOptions} from "@atomiqlabs/base";
+import {BitcoinNetwork, ChainInterface, TransactionConfirmationOptions} from "@atomiqlabs/base";
 import {SolanaAddresses} from "./modules/SolanaAddresses";
 import {SolanaSigner} from "../wallet/SolanaSigner";
 import {Buffer} from "buffer";
 import {SolanaKeypairWallet} from "../wallet/SolanaKeypairWallet";
 import {Wallet} from "@coral-xyz/anchor/dist/cjs/provider";
+import {SolanaChains} from "../SolanaChains";
+
+const CLUSTER_BY_GENESIS_HASH: Record<string, "mainnet-beta" | "devnet" | "testnet"> = {
+    "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d": "mainnet-beta",
+    "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG": "devnet",
+    "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY": "testnet",
+};
 
 /**
  * Retry policy configuration for Solana RPC calls
@@ -359,4 +366,22 @@ export class SolanaChainInterface implements ChainInterface<
         return Promise.resolve(new SolanaSigner(signer));
     }
 
+    async verifyNetwork(bitcoinNetwork: BitcoinNetwork): Promise<void> {
+        const genesisHash = await this._connection.getGenesisHash();
+        const result = CLUSTER_BY_GENESIS_HASH[genesisHash];
+        if(result==null) {
+            this.logger.warn(`verifyNetwork(): Unknown cluster detected, genesis hash: ${genesisHash}`);
+            return;
+        }
+
+        const deployment = SolanaChains[bitcoinNetwork];
+        if(deployment==null) {
+            this.logger.warn(`verifyNetwork(): No Solana deployment is defined for ${BitcoinNetwork[bitcoinNetwork]}, the RPC check is skipped.`);
+            return;
+        }
+
+        if(deployment.clusterName!==result)
+            throw new Error(`Expected ${deployment.clusterName} Solana cluster for ${BitcoinNetwork[bitcoinNetwork]}, but got ${result}!`);
+    }
+
 }