@atomiqlabs/chain-solana 13.1.0 → 13.2.1

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

@@ -133,6 +133,10 @@ export declare class SolanaChainInterface implements ChainInterface<SolanaTx, Si
      * @inheritDoc
      */
     sendSignedAndConfirm(txs: SignedSolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    /**
+     * @inheritDoc
+     */
+    prepareTxs(txs: SolanaTx[]): Promise<SolanaTx[]>;
     /**
      * @inheritDoc
      */

package/dist/solana/chain/SolanaChainInterface.js

@@ -109,6 +109,13 @@ class SolanaChainInterface {
     sendSignedAndConfirm(txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
         return this.Transactions.sendSignedAndConfirm(txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
     }
+    /**
+     * @inheritDoc
+     */
+    async prepareTxs(txs) {
+        await this.Transactions.prepareTransactions(txs);
+        return txs;
+    }
     /**
      * @inheritDoc
      */

package/dist/solana/chain/modules/SolanaTransactions.d.ts

@@ -73,11 +73,10 @@ export declare class SolanaTransactions extends SolanaModule {
      * Prepares solana transactions, assigns recentBlockhash if needed, applies Phantom hotfix,
      *  sets feePayer to ourselves, calls beforeTxSigned callback & signs transaction with provided signers array
      *
-     * @param signer
      * @param txs
-     * @private
+     * @param signer
      */
-    private prepareTransactions;
+    prepareTransactions(txs: SolanaTx[], signer?: SolanaSigner): Promise<void>;
     /**
      * Sends out a signed transaction to the RPC
      *

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

@@ -159,11 +159,15 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
      * Prepares solana transactions, assigns recentBlockhash if needed, applies Phantom hotfix,
      *  sets feePayer to ourselves, calls beforeTxSigned callback & signs transaction with provided signers array
      *
-     * @param signer
      * @param txs
-     * @private
+     * @param signer
      */
-    async prepareTransactions(signer, txs) {
+    async prepareTransactions(txs, signer) {
+        if (txs.length === 0)
+            return;
+        const signerAddress = signer?.getPublicKey() ?? txs[0].tx.feePayer;
+        if (signerAddress == null)
+            throw new Error("Cannot get tx sender address!");
         let latestBlockData = null;
         for (let tx of txs) {
             if (tx.tx.recentBlockhash == null) {
@@ -177,13 +181,13 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
             }
             //This is a hotfix for Phantom adding compute unit price instruction on the first position & breaking
             // required instructions order (e.g. btc relay verify needs to be 0th instruction in a tx)
-            if (signer.keypair == null && tx.tx.signatures.length === 0) {
+            if ((signer == null || signer.keypair == null) && tx.tx.signatures.length === 0) {
                 const foundIx = tx.tx.instructions.find(ix => ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId) && web3_js_1.ComputeBudgetInstruction.decodeInstructionType(ix) === "SetComputeUnitPrice");
                 if (foundIx == null)
                     tx.tx.instructions.splice(tx.tx.instructions.length - 1, 0, web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 }));
             }
-            tx.tx.feePayer = signer.getPublicKey();
-            if (this.cbkBeforeTxSigned != null)
+            tx.tx.feePayer = signerAddress;
+            if (signer != null && this.cbkBeforeTxSigned != null)
                 await this.cbkBeforeTxSigned(tx);
             if (tx.signers != null && tx.signers.length > 0)
                 for (let signer of tx.signers)
@@ -235,7 +239,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
         const signatures = [];
         for (let e = 0; e < _txs.length; e += BATCH_SIZE) {
             const txs = _txs.slice(e, e + BATCH_SIZE);
-            await this.prepareTransactions(signer, txs);
+            await this.prepareTransactions(txs, signer);
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
             signedTxs.forEach((tx, index) => {
                 const solTx = txs[index];
@@ -305,7 +309,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
      */
     serializeUnsignedTx(tx) {
         return JSON.stringify({
-            tx: tx.tx.serialize().toString("hex"),
+            tx: tx.tx.serialize({ requireAllSignatures: false, verifySignatures: false }).toString("hex"),
             signers: tx.signers.map(e => buffer_1.Buffer.from(e.secretKey).toString("hex")),
             lastValidBlockheight: tx.tx.lastValidBlockHeight
         });
@@ -316,7 +320,7 @@ class SolanaTransactions extends SolanaModule_1.SolanaModule {
      * @param signedTx
      */
     serializeSignedTx(signedTx) {
-        return signedTx.serialize().toString("hex");
+        return signedTx.serialize({ requireAllSignatures: false, verifySignatures: false }).toString("hex");
     }
     /**
      * Deserializes saved solana transaction, extracting the transaction, signers & last valid blockheight

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "13.1.0",
+  "version": "13.2.1",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
   "scripts": {
+    "build": "npx -y -p typescript@4.9 tsc",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build:ts4": "npx -p typescript@4.9 tsc --noEmit",
     "build:ts5": "npx -p typescript@5 tsc --noEmit"
@@ -25,7 +26,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^13.0.4",
+    "@atomiqlabs/base": "^13.2.0",
     "@coral-xyz/anchor": "0.29.0",
     "@noble/hashes": "^1.7.1",
     "@solana/spl-token": "0.4.14",

package/src/solana/chain/SolanaChainInterface.ts

@@ -216,6 +216,14 @@ export class SolanaChainInterface implements ChainInterface<
         return this.Transactions.sendSignedAndConfirm(txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
     }
 
+    /**
+     * @inheritDoc
+     */
+    async prepareTxs(txs: SolanaTx[]): Promise<SolanaTx[]> {
+        await this.Transactions.prepareTransactions(txs);
+        return txs;
+    }
+
     /**
      * @inheritDoc
      */

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

@@ -195,11 +195,14 @@ export class SolanaTransactions extends SolanaModule {
      * Prepares solana transactions, assigns recentBlockhash if needed, applies Phantom hotfix,
      *  sets feePayer to ourselves, calls beforeTxSigned callback & signs transaction with provided signers array
      *
-     * @param signer
      * @param txs
-     * @private
+     * @param signer
      */
-    private async prepareTransactions(signer: SolanaSigner, txs: SolanaTx[]): Promise<void> {
+    public async prepareTransactions(txs: SolanaTx[], signer?: SolanaSigner): Promise<void> {
+        if(txs.length===0) return;
+        const signerAddress = signer?.getPublicKey() ?? txs[0].tx.feePayer;
+        if(signerAddress==null) throw new Error("Cannot get tx sender address!");
+
         let latestBlockData: {blockhash: string, lastValidBlockHeight: number} | null = null;
 
         for(let tx of txs) {
@@ -215,13 +218,13 @@ export class SolanaTransactions extends SolanaModule {
 
             //This is a hotfix for Phantom adding compute unit price instruction on the first position & breaking
             // required instructions order (e.g. btc relay verify needs to be 0th instruction in a tx)
-            if(signer.keypair==null && tx.tx.signatures.length===0) {
+            if((signer==null || signer.keypair==null) && tx.tx.signatures.length===0) {
                 const foundIx = tx.tx.instructions.find(ix => ix.programId.equals(ComputeBudgetProgram.programId) && ComputeBudgetInstruction.decodeInstructionType(ix)==="SetComputeUnitPrice")
                 if(foundIx==null) tx.tx.instructions.splice(tx.tx.instructions.length-1, 0, ComputeBudgetProgram.setComputeUnitPrice({microLamports: 1}));
             }
 
-            tx.tx.feePayer = signer.getPublicKey();
-            if(this.cbkBeforeTxSigned!=null) await this.cbkBeforeTxSigned(tx);
+            tx.tx.feePayer = signerAddress;
+            if(signer!=null && this.cbkBeforeTxSigned!=null) await this.cbkBeforeTxSigned(tx);
             if(tx.signers!=null && tx.signers.length>0) for(let signer of tx.signers) tx.tx.sign(signer);
         }
     }
@@ -275,7 +278,7 @@ export class SolanaTransactions extends SolanaModule {
         for(let e=0;e<_txs.length;e+=BATCH_SIZE) {
             const txs = _txs.slice(e, e+BATCH_SIZE);
 
-            await this.prepareTransactions(signer, txs)
+            await this.prepareTransactions(txs, signer)
             const signedTxs = await signer.wallet.signAllTransactions(txs.map(e => e.tx));
             signedTxs.forEach((tx, index) => {
                 const solTx = txs[index];
@@ -357,7 +360,7 @@ export class SolanaTransactions extends SolanaModule {
      */
     public serializeUnsignedTx(tx: SolanaTx): string {
         return JSON.stringify({
-            tx: tx.tx.serialize().toString("hex"),
+            tx: tx.tx.serialize({requireAllSignatures: false, verifySignatures: false}).toString("hex"),
             signers: tx.signers.map(e => Buffer.from(e.secretKey).toString("hex")),
             lastValidBlockheight: tx.tx.lastValidBlockHeight
         });
@@ -369,7 +372,7 @@ export class SolanaTransactions extends SolanaModule {
      * @param signedTx
      */
     public serializeSignedTx(signedTx: Transaction): string {
-        return signedTx.serialize().toString("hex");
+        return signedTx.serialize({requireAllSignatures: false, verifySignatures: false}).toString("hex");
     }
 
     /**