@atomiqlabs/chain-solana 13.5.13 → 13.5.14

package/src/solana/chain/SolanaAction.ts

@@ -1,110 +1,110 @@
-import {PublicKey, Signer, Transaction, TransactionInstruction} from "@solana/web3.js";
-import {SolanaTx} from "./modules/SolanaTransactions";
-import {SolanaChainInterface} from "./SolanaChainInterface";
-import {SolanaFees} from "./modules/SolanaFees";
-
-
-export class SolanaAction {
-
-    computeBudget: number | null;
-    readonly mainSigner: PublicKey;
-    private readonly root: SolanaChainInterface;
-    private readonly instructions: TransactionInstruction[];
-    private feeRate?: string;
-    private readonly signers: Signer[];
-    private firstIxBeforeComputeBudget: boolean = false;
-
-    constructor(
-        mainSigner: PublicKey,
-        root: SolanaChainInterface,
-        instructions: TransactionInstruction[] | TransactionInstruction = [],
-        computeBudget: number = 0,
-        feeRate?: string,
-        signers?: Signer[],
-        firstIxBeforeComputeBudget?: boolean
-    ) {
-        this.mainSigner = mainSigner;
-        this.root = root;
-        this.instructions = Array.isArray(instructions) ? instructions : [instructions];
-        this.computeBudget = computeBudget;
-        this.feeRate = feeRate;
-        this.signers = signers || [];
-        if(firstIxBeforeComputeBudget!=null) this.firstIxBeforeComputeBudget = firstIxBeforeComputeBudget;
-    }
-
-    private estimateFee(): Promise<string> {
-        const mutableAccounts: PublicKey[] = [];
-        this.instructions.forEach(
-            ix => ix.keys.forEach(
-                key => key.isWritable && mutableAccounts.push(key.pubkey)
-            )
-        );
-        return this.root.Fees.getFeeRate(mutableAccounts);
-    }
-
-    public addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]) {
-        this.instructions.push(instruction);
-        if(this.computeBudget==null) {
-            this.computeBudget = computeBudget ?? null;
-        } else {
-            if(computeBudget!=null) this.computeBudget+=computeBudget;
-        }
-    }
-
-    public add(action: SolanaAction): this {
-        return this.addAction(action);
-    }
-
-    public addAction(action: SolanaAction, index: number = this.instructions.length, noSignerCheck?: boolean): this {
-        if(action.firstIxBeforeComputeBudget) {
-            if(this.instructions.length>0)
-                throw new Error("Tried to add firstIxBeforeComputeBudget action to existing action with instructions");
-            this.firstIxBeforeComputeBudget = true;
-        }
-        if(this.firstIxBeforeComputeBudget && this.instructions.length>0 && index===0)
-            throw new Error("Tried adding to firstIxBeforeComputeBudget action on 0th index");
-        if(!noSignerCheck && !action.mainSigner.equals(this.mainSigner)) throw new Error("Actions need to have the same signer!");
-        if(this.computeBudget==null && action.computeBudget!=null) this.computeBudget = action.computeBudget;
-        if(this.computeBudget!=null && action.computeBudget!=null) this.computeBudget += action.computeBudget;
-        this.instructions.splice(index, 0, ...action.instructions);
-        this.signers.push(...action.signers);
-        if(this.feeRate==null) this.feeRate = action.feeRate;
-        return this;
-    }
-
-    public async tx(feeRate?: string, block?: {blockhash: string, blockHeight: number}): Promise<SolanaTx> {
-        const tx = new Transaction();
-        tx.feePayer = this.mainSigner;
-
-        if(feeRate==null) feeRate = this.feeRate;
-        if(feeRate==null) feeRate = await this.estimateFee();
-
-        let instructions = this.instructions;
-        if(instructions.length>0 && this.firstIxBeforeComputeBudget) {
-            tx.add(this.instructions[0]);
-            instructions = this.instructions.slice(1);
-        }
-        SolanaFees.applyFeeRateBegin(tx, this.computeBudget, feeRate);
-        instructions.forEach(ix => tx.add(ix));
-        SolanaFees.applyFeeRateEnd(tx, this.computeBudget, feeRate);
-
-        if(block!=null) {
-            tx.recentBlockhash = block.blockhash;
-            tx.lastValidBlockHeight = block.blockHeight + this.root._TX_SLOT_VALIDITY;
-        }
-
-        return {
-            tx,
-            signers: this.signers
-        };
-    }
-
-    public async addToTxs(txs: SolanaTx[], feeRate?: string, block?: {blockhash: string, blockHeight: number}): Promise<void> {
-        txs.push(await this.tx(feeRate, block));
-    }
-
-    public ixsLength(): number {
-        return this.instructions.length;
-    }
-
+import {PublicKey, Signer, Transaction, TransactionInstruction} from "@solana/web3.js";
+import {SolanaTx} from "./modules/SolanaTransactions";
+import {SolanaChainInterface} from "./SolanaChainInterface";
+import {SolanaFees} from "./modules/SolanaFees";
+
+
+export class SolanaAction {
+
+    computeBudget: number | null;
+    readonly mainSigner: PublicKey;
+    private readonly root: SolanaChainInterface;
+    private readonly instructions: TransactionInstruction[];
+    private feeRate?: string;
+    private readonly signers: Signer[];
+    private firstIxBeforeComputeBudget: boolean = false;
+
+    constructor(
+        mainSigner: PublicKey,
+        root: SolanaChainInterface,
+        instructions: TransactionInstruction[] | TransactionInstruction = [],
+        computeBudget: number = 0,
+        feeRate?: string,
+        signers?: Signer[],
+        firstIxBeforeComputeBudget?: boolean
+    ) {
+        this.mainSigner = mainSigner;
+        this.root = root;
+        this.instructions = Array.isArray(instructions) ? instructions : [instructions];
+        this.computeBudget = computeBudget;
+        this.feeRate = feeRate;
+        this.signers = signers || [];
+        if(firstIxBeforeComputeBudget!=null) this.firstIxBeforeComputeBudget = firstIxBeforeComputeBudget;
+    }
+
+    private estimateFee(): Promise<string> {
+        const mutableAccounts: PublicKey[] = [];
+        this.instructions.forEach(
+            ix => ix.keys.forEach(
+                key => key.isWritable && mutableAccounts.push(key.pubkey)
+            )
+        );
+        return this.root.Fees.getFeeRate(mutableAccounts);
+    }
+
+    public addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]) {
+        this.instructions.push(instruction);
+        if(this.computeBudget==null) {
+            this.computeBudget = computeBudget ?? null;
+        } else {
+            if(computeBudget!=null) this.computeBudget+=computeBudget;
+        }
+    }
+
+    public add(action: SolanaAction): this {
+        return this.addAction(action);
+    }
+
+    public addAction(action: SolanaAction, index: number = this.instructions.length, noSignerCheck?: boolean): this {
+        if(action.firstIxBeforeComputeBudget) {
+            if(this.instructions.length>0)
+                throw new Error("Tried to add firstIxBeforeComputeBudget action to existing action with instructions");
+            this.firstIxBeforeComputeBudget = true;
+        }
+        if(this.firstIxBeforeComputeBudget && this.instructions.length>0 && index===0)
+            throw new Error("Tried adding to firstIxBeforeComputeBudget action on 0th index");
+        if(!noSignerCheck && !action.mainSigner.equals(this.mainSigner)) throw new Error("Actions need to have the same signer!");
+        if(this.computeBudget==null && action.computeBudget!=null) this.computeBudget = action.computeBudget;
+        if(this.computeBudget!=null && action.computeBudget!=null) this.computeBudget += action.computeBudget;
+        this.instructions.splice(index, 0, ...action.instructions);
+        this.signers.push(...action.signers);
+        if(this.feeRate==null) this.feeRate = action.feeRate;
+        return this;
+    }
+
+    public async tx(feeRate?: string, block?: {blockhash: string, blockHeight: number}): Promise<SolanaTx> {
+        const tx = new Transaction();
+        tx.feePayer = this.mainSigner;
+
+        if(feeRate==null) feeRate = this.feeRate;
+        if(feeRate==null) feeRate = await this.estimateFee();
+
+        let instructions = this.instructions;
+        if(instructions.length>0 && this.firstIxBeforeComputeBudget) {
+            tx.add(this.instructions[0]);
+            instructions = this.instructions.slice(1);
+        }
+        SolanaFees.applyFeeRateBegin(tx, this.computeBudget, feeRate);
+        instructions.forEach(ix => tx.add(ix));
+        SolanaFees.applyFeeRateEnd(tx, this.computeBudget, feeRate);
+
+        if(block!=null) {
+            tx.recentBlockhash = block.blockhash;
+            tx.lastValidBlockHeight = block.blockHeight + this.root._TX_SLOT_VALIDITY;
+        }
+
+        return {
+            tx,
+            signers: this.signers
+        };
+    }
+
+    public async addToTxs(txs: SolanaTx[], feeRate?: string, block?: {blockhash: string, blockHeight: number}): Promise<void> {
+        txs.push(await this.tx(feeRate, block));
+    }
+
+    public ixsLength(): number {
+        return this.instructions.length;
+    }
+
 }