@atomiqlabs/chain-solana 10.0.0-dev.3 → 10.0.0-dev.5

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -44,7 +44,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             headerTopic: this.BtcRelayHeader(serializedBlock.hash),
             systemProgram: web3_js_1.SystemProgram.programId
         })
-            .instruction());
+            .instruction(), 100000);
     }
     /**
      * Creates verify action to be used with the swap program, specifies the action to be firstIxBeforeComputeBudget,

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

@@ -209,9 +209,10 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
         };
         this.logger.debug("sendAndConfirm(): sending transactions, count: " + _txs.length +
             " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
+        const BATCH_SIZE = 50;
         const signatures = [];
-        for (let e = 0; e < _txs.length; e += 50) {
-            const txs = _txs.slice(e, e + 50);
+        for (let e = 0; e < _txs.length; e += BATCH_SIZE) {
+            const txs = _txs.slice(e, e + BATCH_SIZE);
             await this.prepareTransactions(signer, txs);
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
             signedTxs.forEach((tx, index) => {
@@ -220,27 +221,16 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
                 solTx.tx = tx;
             });
             this.logger.debug("sendAndConfirm(): sending transaction batch (" + e + ".." + (e + 50) + "), count: " + txs.length);
-            if (parallel) {
-                const promises = [];
-                for (let solTx of txs) {
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    if (waitForConfirmation)
-                        promises.push(this.confirmTransaction(solTx, abortSignal, "confirmed"));
-                    signatures.push(signature);
-                }
-                if (promises.length > 0)
-                    await Promise.all(promises);
-            }
-            else {
-                for (let i = 0; i < txs.length; i++) {
-                    const solTx = txs[i];
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
-                    //Don't await the last promise when !waitForConfirmation
-                    if (i < txs.length - 1 || e + 50 < _txs.length || waitForConfirmation)
-                        await confirmPromise;
-                    signatures.push(signature);
-                }
+            //For solana we are forced to send txs one-by-one even with parallel, as we cannot determine their order upfront,
+            // however e.g. Jito could possibly handle sending a single package of up to 5 txns in order.
+            for (let i = 0; i < txs.length; i++) {
+                const solTx = txs[i];
+                const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
+                const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
+                //Don't await the last promise when !waitForConfirmation
+                if (i < txs.length - 1 || e + 50 < _txs.length || waitForConfirmation)
+                    await confirmPromise;
+                signatures.push(signature);
             }
         }
         this.logger.info("sendAndConfirm(): sent transactions, count: " + _txs.length +

package/dist/solana/events/SolanaChainEvents.js

@@ -91,7 +91,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
         try {
             const transaction = await this.connection.getParsedTransaction(signature, {
                 commitment: "confirmed",
-                maxSupportedTransactionVersion: 0
+                maxSupportedTransactionVersion: 1
             });
             if (transaction == null)
                 return false;

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -196,11 +196,15 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         //Check if paid or what
         const status = await this.Events.findInEvents(escrowStateKey, async (event, info) => {
             if (event.name === "ClaimEvent") {
+                const paymentHash = buffer_1.Buffer.from(event.data.hash).toString("hex");
+                if (paymentHash !== data.paymentHash)
+                    return null;
                 if (!event.data.sequence.eq(data.sequence))
                     return null;
                 return {
                     type: base_1.SwapCommitStateType.PAID,
                     getClaimTxId: () => Promise.resolve(info.signature),
+                    getClaimResult: () => Promise.resolve(buffer_1.Buffer.from(event.data.secret).toString("hex")),
                     getTxBlock: async () => {
                         return {
                             blockHeight: (await this.Chain.Blocks.getParsedBlock(info.slot)).blockHeight,
@@ -210,6 +214,9 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                 };
             }
             if (event.name === "RefundEvent") {
+                const paymentHash = buffer_1.Buffer.from(event.data.hash).toString("hex");
+                if (paymentHash !== data.paymentHash)
+                    return null;
                 if (!event.data.sequence.eq(data.sequence))
                     return null;
                 return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "10.0.0-dev.3",
+  "version": "10.0.0-dev.5",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.2",
+    "@atomiqlabs/base": "^10.0.0-dev.9",
     "@noble/hashes": "^1.7.1",
     "bn.js": "5.2.1",
     "bs58": "4.0.1",

package/src/solana/btcrelay/SolanaBtcRelay.ts

@@ -62,7 +62,8 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
                     headerTopic: this.BtcRelayHeader(serializedBlock.hash),
                     systemProgram: SystemProgram.programId
                 })
-                .instruction()
+                .instruction(),
+            100_000
         )
     }
 

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

@@ -239,9 +239,11 @@ export class SolanaTransactions extends SolanaModule {
         this.logger.debug("sendAndConfirm(): sending transactions, count: "+_txs.length+
             " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
 
+        const BATCH_SIZE = 50;
+
         const signatures: string[] = [];
-        for(let e=0;e<_txs.length;e+=50) {
-            const txs = _txs.slice(e, e+50);
+        for(let e=0;e<_txs.length;e+=BATCH_SIZE) {
+            const txs = _txs.slice(e, e+BATCH_SIZE);
 
             await this.prepareTransactions(signer, txs)
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
@@ -252,23 +254,15 @@ export class SolanaTransactions extends SolanaModule {
             });
             this.logger.debug("sendAndConfirm(): sending transaction batch ("+e+".."+(e+50)+"), count: "+txs.length);
 
-            if(parallel) {
-                const promises: Promise<void>[] = [];
-                for(let solTx of txs) {
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    if(waitForConfirmation) promises.push(this.confirmTransaction(solTx, abortSignal, "confirmed"));
-                    signatures.push(signature);
-                }
-                if(promises.length>0) await Promise.all(promises);
-            } else {
-                for(let i=0;i<txs.length;i++) {
-                    const solTx = txs[i];
-                    const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
-                    const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
-                    //Don't await the last promise when !waitForConfirmation
-                    if(i<txs.length-1 || e+50<_txs.length || waitForConfirmation) await confirmPromise;
-                    signatures.push(signature);
-                }
+            //For solana we are forced to send txs one-by-one even with parallel, as we cannot determine their order upfront,
+            // however e.g. Jito could possibly handle sending a single package of up to 5 txns in order.
+            for(let i=0;i<txs.length;i++) {
+                const solTx = txs[i];
+                const signature = await this.sendSignedTransaction(solTx, options, onBeforePublish);
+                const confirmPromise = this.confirmTransaction(solTx, abortSignal, "confirmed");
+                //Don't await the last promise when !waitForConfirmation
+                if(i<txs.length-1 || e+50<_txs.length || waitForConfirmation) await confirmPromise;
+                signatures.push(signature);
             }
         }
 

package/src/solana/events/SolanaChainEvents.ts

@@ -118,7 +118,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
         try {
             const transaction = await this.connection.getParsedTransaction(signature, {
                 commitment: "confirmed",
-                maxSupportedTransactionVersion: 0
+                maxSupportedTransactionVersion: 1
             });
             if(transaction==null) return false;
 

package/src/solana/swaps/SolanaSwapProgram.ts

@@ -33,7 +33,7 @@ import {SwapClaim} from "./modules/SwapClaim";
 import {SolanaLpVault} from "./modules/SolanaLpVault";
 import {Buffer} from "buffer";
 import {SolanaSigner} from "../wallet/SolanaSigner";
-import {fromClaimHash, toBN, toClaimHash} from "../../utils/Utils";
+import {fromClaimHash, toBN, toClaimHash, toEscrowHash} from "../../utils/Utils";
 import {SolanaTokens} from "../chain/modules/SolanaTokens";
 import * as BN from "bn.js";
 
@@ -271,10 +271,13 @@ export class SolanaSwapProgram
         //Check if paid or what
         const status: SwapNotCommitedState | SwapExpiredState | SwapPaidState = await this.Events.findInEvents(escrowStateKey, async (event, info) => {
             if(event.name==="ClaimEvent") {
+                const paymentHash = Buffer.from(event.data.hash).toString("hex");
+                if(paymentHash!==data.paymentHash) return null;
                 if(!event.data.sequence.eq(data.sequence)) return null;
                 return {
                     type: SwapCommitStateType.PAID,
                     getClaimTxId: () => Promise.resolve(info.signature),
+                    getClaimResult: () => Promise.resolve(Buffer.from(event.data.secret).toString("hex")),
                     getTxBlock: async () => {
                         return {
                             blockHeight: (await this.Chain.Blocks.getParsedBlock(info.slot)).blockHeight,
@@ -284,6 +287,8 @@ export class SolanaSwapProgram
                 }
             }
             if(event.name==="RefundEvent") {
+                const paymentHash = Buffer.from(event.data.hash).toString("hex");
+                if(paymentHash!==data.paymentHash) return null;
                 if(!event.data.sequence.eq(data.sequence)) return null;
                 return {
                     type: isExpired ? SwapCommitStateType.EXPIRED : SwapCommitStateType.NOT_COMMITED,