@atomiqlabs/chain-solana 12.0.9 → 12.0.12

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -303,6 +303,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                 latestBlockheight = tx.slot;
             events.push({ event, tx });
         }, undefined, undefined, startBlockheight);
+        this.logger.debug(`getHistoricalSwaps(): Found ${events.length} atomiq related events!`);
         const swapsOpened = {};
         const resultingSwaps = {};
         events.reverse();
@@ -320,7 +321,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                 }
                 const initIx = instructions.find(ix => ix != null && (ix.name === "offererInitializePayIn" || ix.name === "offererInitialize"));
                 if (initIx == null) {
-                    this.logger.warn(`getHistoricalSwaps(): Skipping tx ${txSignature} because cannot init instruction not found!`);
+                    this.logger.warn(`getHistoricalSwaps(): Skipping tx ${txSignature} because init instruction not found!`);
                     continue;
                 }
                 swapsOpened[escrowHash] = {
@@ -365,6 +366,8 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                 };
             }
         }
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
         for (let escrowHash in swapsOpened) {
             const foundSwapData = swapsOpened[escrowHash];
             const isExpired = await this.isExpired(signer, foundSwapData.data);

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.9",
+  "version": "12.0.12",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/solana/swaps/SolanaSwapProgram.ts

@@ -403,6 +403,8 @@ export class SolanaSwapProgram
             events.push({event, tx});
         }, undefined, undefined, startBlockheight);
 
+        this.logger.debug(`getHistoricalSwaps(): Found ${events.length} atomiq related events!`);
+
         const swapsOpened: {[escrowHash: string]: {
             data: SolanaSwapData,
             getInitTxId: () => Promise<string>,
@@ -444,7 +446,7 @@ export class SolanaSwapProgram
                   ix => ix!=null && (ix.name === "offererInitializePayIn" || ix.name === "offererInitialize")
                 ) as InitInstruction;
                 if(initIx == null) {
-                    this.logger.warn(`getHistoricalSwaps(): Skipping tx ${txSignature} because cannot init instruction not found!`);
+                    this.logger.warn(`getHistoricalSwaps(): Skipping tx ${txSignature} because init instruction not found!`);
                     continue;
                 }
 
@@ -493,6 +495,9 @@ export class SolanaSwapProgram
             }
         }
 
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(resultingSwaps).length} settled swaps!`);
+        this.logger.debug(`getHistoricalSwaps(): Found ${Object.keys(swapsOpened).length} unsettled swaps!`);
+
         for(let escrowHash in swapsOpened) {
             const foundSwapData = swapsOpened[escrowHash];
             const isExpired = await this.isExpired(signer, foundSwapData.data);

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);
     }
 
 }