@atomiqlabs/chain-solana 12.0.8 → 12.0.11

package/dist/solana/chain/modules/SolanaEvents.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaEvents = void 0;
 const SolanaModule_1 = require("../SolanaModule");
 const web3_js_1 = require("@solana/web3.js");
+const Utils_1 = require("../../../utils/Utils");
 class SolanaEvents extends SolanaModule_1.SolanaModule {
     constructor() {
         super(...arguments);
@@ -150,13 +151,13 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
             let filters = startBlockheight != null ? {
                 slot: { gte: startBlockheight }
             } : {};
-            const tfaResult = await this.getTransactionsForAddress(topicKey, {
+            const tfaResult = await (0, Utils_1.tryWithRetries)(() => this.getTransactionsForAddress(topicKey, {
                 paginationToken,
                 filters: {
                     ...filters,
                     status: "succeeded"
                 }
-            }, "confirmed");
+            }, "confirmed"), undefined, undefined, abortSignal);
             if (tfaResult == null) {
                 //Not supported
                 return undefined;

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

@@ -199,7 +199,17 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
         this.logger.debug("txsRefundWithAuthorization(): creating claim transaction, swap: " + swapData.getClaimHash() +
             " initializingAta: " + shouldInitAta + " unwrapping: " + shouldUnwrap +
             " auth expiry: " + timeout + " signature: " + signature);
-        return [await action.tx(feeRate)];
+        //Push a random keypair to the TX signer such that pesky Phantom
+        // doesn't fuck up the instructions order!
+        const tx = await action.tx(feeRate);
+        const signer = web3_js_1.Keypair.generate();
+        tx.tx.instructions.find(val => val.programId.equals(this.program.program.programId)).keys.push({
+            pubkey: signer.publicKey,
+            isSigner: true,
+            isWritable: false
+        });
+        (tx.signers ?? (tx.signers = [])).push(signer);
+        return [tx];
     }
     getRefundFeeRate(swapData) {
         const accounts = [];
@@ -239,10 +249,10 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
      */
     async getRawRefundFee(swapData, feeRate) {
         if (swapData == null)
-            return 10000n;
+            return 15000n;
         feeRate = feeRate || await this.getRefundFeeRate(swapData);
         const computeBudget = swapData.payIn ? SwapRefund.CUCosts.REFUND_PAY_OUT : SwapRefund.CUCosts.REFUND;
-        return 10000n + this.root.Fees.getPriorityFee(computeBudget, feeRate);
+        return 15000n + this.root.Fees.getPriorityFee(computeBudget, feeRate);
     }
 }
 exports.SwapRefund = SwapRefund;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "12.0.8",
+  "version": "12.0.11",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/solana/chain/modules/SolanaEvents.ts

@@ -2,6 +2,7 @@ import {SolanaModule} from "../SolanaModule";
 import {ConfirmedSignatureInfo, ParsedTransactionWithMeta, PublicKey} from "@solana/web3.js";
 import {sign} from "tweetnacl";
 import {ProgramEvent} from "../../program/modules/SolanaProgramEvents";
+import {tryWithRetries} from "../../../utils/Utils";
 
 export class SolanaEvents extends SolanaModule {
 
@@ -171,13 +172,16 @@ export class SolanaEvents extends SolanaModule {
             let filters = startBlockheight!=null ? {
                 slot: {gte: startBlockheight}
             } : {};
-            const tfaResult = await this.getTransactionsForAddress(topicKey, {
-                paginationToken,
-                filters: {
-                    ...filters,
-                    status: "succeeded"
-                }
-            }, "confirmed");
+            const tfaResult = await tryWithRetries(
+                () => this.getTransactionsForAddress(topicKey, {
+                    paginationToken,
+                    filters: {
+                        ...filters,
+                        status: "succeeded"
+                    }
+                }, "confirmed"),
+                undefined, undefined, abortSignal
+            );
 
             if(tfaResult==null) {
                 //Not supported

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

@@ -5,7 +5,7 @@ import {sign} from "tweetnacl";
 import {SignatureVerificationError, SwapDataVerificationError} from "@atomiqlabs/base";
 import {SolanaTx} from "../../chain/modules/SolanaTransactions";
 import {
-    Ed25519Program,
+    Ed25519Program, Keypair,
     PublicKey,
     SYSVAR_INSTRUCTIONS_PUBKEY
 } from "@solana/web3.js";
@@ -265,7 +265,18 @@ export class SwapRefund extends SolanaSwapModule {
             " initializingAta: "+shouldInitAta+" unwrapping: "+shouldUnwrap+
             " auth expiry: "+timeout+" signature: "+signature);
 
-        return [await action.tx(feeRate)];
+        //Push a random keypair to the TX signer such that pesky Phantom
+        // doesn't fuck up the instructions order!
+        const tx = await action.tx(feeRate);
+        const signer = Keypair.generate();
+        tx.tx.instructions.find(val => val.programId.equals(this.program.program.programId)).keys.push({
+            pubkey: signer.publicKey,
+            isSigner: true,
+            isWritable: false
+        });
+        (tx.signers ??= []).push(signer);
+
+        return [tx];
     }
 
     public getRefundFeeRate(swapData: SolanaSwapData): Promise<string> {
@@ -301,13 +312,13 @@ export class SwapRefund extends SolanaSwapModule {
      * Get the estimated solana transaction fee of the refund transaction
      */
     async getRawRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
-        if(swapData==null) return 10000n;
+        if(swapData==null) return 15000n;
 
         feeRate = feeRate || await this.getRefundFeeRate(swapData);
 
         const computeBudget = swapData.payIn ? SwapRefund.CUCosts.REFUND_PAY_OUT : SwapRefund.CUCosts.REFUND;
 
-        return 10000n + this.root.Fees.getPriorityFee(computeBudget, feeRate);
+        return 15000n + this.root.Fees.getPriorityFee(computeBudget, feeRate);
     }
 
 }