@atomiqlabs/chain-solana 13.5.7 → 13.5.10

package/dist/solana/SolanaChains.js

@@ -21,6 +21,10 @@ exports.SolanaChains = {
             v1: {
                 swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
                 btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            },
+            v2: {
+                swapContract: "atq2FYuvww5EF6qeB28gj9tkao6Ld9mEGUzF4M93cCC",
+                btcRelayContract: "btc2WHkrjoZU9xzFJupDCmMaUTRHyYTzJE25LvEi9Ls"
             }
         },
         clusterName: "devnet"

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

@@ -117,6 +117,10 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, Si
      * @inheritDoc
      */
     getNativeCurrencyAddress(): string;
+    /**
+     * @inheritDoc
+     */
+    shouldGetNativeTokenDrop(tokenAddress: string): boolean;
     /**
      * @inheritDoc
      */

package/dist/solana/chain/SolanaChainInterface.js

@@ -90,6 +90,13 @@ class SolanaChainInterface {
     getNativeCurrencyAddress() {
         return this.Tokens.getNativeCurrencyAddress().toString();
     }
+    /**
+     * @inheritDoc
+     */
+    shouldGetNativeTokenDrop(tokenAddress) {
+        // True for all the tokens, because the contracts don't support native SOL handling yet
+        return true;
+    }
     /**
      * @inheritDoc
      */

package/dist/solana/connection/ConnectionWithRetries.js

@@ -63,7 +63,7 @@ class ConnectionWithRetries extends web3_js_1.Connection {
             e?.message !== "Network request timed out" &&
             e?.message !== "Too many requests (429)", init?.signal ?? undefined);
         config.disableRetryOnRateLimit = true;
-        super(endpoint, commitmentOrConfig);
+        super(endpoint, config);
         this.retryPolicy = config?.retryPolicy;
         this.requestTimeout = config?.requestTimeout ?? 15 * 1000;
     }

package/dist/solana/swaps/modules/SolanaDataAccount.js

@@ -35,7 +35,9 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
      * @private
      */
     async InitDataAccount(signer, accountKey, dataLength) {
-        const accountSize = 32 + dataLength;
+        const accountSize = this.program.version === "v2"
+            ? 40 + dataLength
+            : 32 + dataLength;
         const lamportsDeposit = await this.connection.getMinimumBalanceForRentExemption(accountSize);
         return new SolanaAction_1.SolanaAction(signer, this.root, [
             web3_js_1.SystemProgram.createAccount({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "13.5.7",
+  "version": "13.5.10",
   "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.5.0",
+    "@atomiqlabs/base": "^13.5.2",
     "@coral-xyz/anchor": "0.29.0",
     "@noble/hashes": "^1.7.1",
     "@solana/spl-token": "0.4.14",

package/src/solana/SolanaChains.ts

@@ -22,6 +22,10 @@ export const SolanaChains: {[key in BitcoinNetwork]?: {
             v1: {
                 swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
                 btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+            },
+            v2: {
+                swapContract: "atq2FYuvww5EF6qeB28gj9tkao6Ld9mEGUzF4M93cCC",
+                btcRelayContract: "btc2WHkrjoZU9xzFJupDCmMaUTRHyYTzJE25LvEi9Ls"
             }
         },
         clusterName: "devnet"

package/src/solana/chain/SolanaChainInterface.ts

@@ -173,6 +173,14 @@ export class SolanaChainInterface implements ChainInterface<
         return this.Tokens.getNativeCurrencyAddress().toString();
     }
 
+    /**
+     * @inheritDoc
+     */
+    shouldGetNativeTokenDrop(tokenAddress: string): boolean {
+        // True for all the tokens, because the contracts don't support native SOL handling yet
+        return true;
+    }
+
     /**
      * @inheritDoc
      */

package/src/solana/connection/ConnectionWithRetries.ts

@@ -88,7 +88,7 @@ export class ConnectionWithRetries extends Connection {
         );
         config.disableRetryOnRateLimit = true;
 
-        super(endpoint, commitmentOrConfig);
+        super(endpoint, config);
         this.retryPolicy = config?.retryPolicy;
         this.requestTimeout = config?.requestTimeout ?? 15*1000;
     }

package/src/solana/swaps/modules/SolanaDataAccount.ts

@@ -64,7 +64,9 @@ export class SolanaDataAccount extends SolanaSwapModule {
         accountKey: Signer,
         dataLength: number
     ): Promise<SolanaAction> {
-        const accountSize = 32+dataLength;
+        const accountSize = this.program.version==="v2"
+            ? 40+dataLength
+            : 32+dataLength;
         const lamportsDeposit = await this.connection.getMinimumBalanceForRentExemption(accountSize);
 
         return new SolanaAction(signer, this.root, [