@atomiqlabs/chain-solana 7.3.8 → 8.0.0-beta.0

package/dist/solana/base/modules/SolanaTokens.js

@@ -1,27 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaTokens = void 0;
 const SolanaModule_1 = require("../SolanaModule");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-const BN = require("bn.js");
 const SolanaAction_1 = require("../SolanaAction");
 const Utils_1 = require("../../../utils/Utils");
 class SolanaTokens extends SolanaModule_1.SolanaModule {
-    constructor() {
-        super(...arguments);
-        this.WSOL_ADDRESS = new web3_js_1.PublicKey("So11111111111111111111111111111111111111112");
-        this.SPL_ATA_RENT_EXEMPT = 2039280;
-    }
     /**
      * Creates an ATA for a specific public key & token, the ATA creation is paid for by the underlying provider's
      *  public key
@@ -47,14 +32,14 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @constructor
      */
     Wrap(publicKey, amount, initAta) {
-        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(this.WSOL_ADDRESS, publicKey, true);
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(SolanaTokens.WSOL_ADDRESS, publicKey, true);
         const action = new SolanaAction_1.SolanaAction(publicKey, this.root);
         if (initAta)
-            action.addIx((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, ata, publicKey, this.WSOL_ADDRESS), SolanaTokens.CUCosts.ATA_INIT);
+            action.addIx((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, ata, publicKey, SolanaTokens.WSOL_ADDRESS), SolanaTokens.CUCosts.ATA_INIT);
         action.addIx(web3_js_1.SystemProgram.transfer({
             fromPubkey: publicKey,
             toPubkey: ata,
-            lamports: BigInt(amount.toString(10))
+            lamports: amount
         }), SolanaTokens.CUCosts.WRAP_SOL);
         action.addIx((0, spl_token_1.createSyncNativeInstruction)(ata));
         return action;
@@ -66,7 +51,7 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @constructor
      */
     Unwrap(publicKey) {
-        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(this.WSOL_ADDRESS, publicKey, true);
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(SolanaTokens.WSOL_ADDRESS, publicKey, true);
         return new SolanaAction_1.SolanaAction(publicKey, this.root, (0, spl_token_1.createCloseAccountInstruction)(ata, publicKey, publicKey), SolanaTokens.CUCosts.ATA_CLOSE);
     }
     /**
@@ -82,7 +67,7 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
         return new SolanaAction_1.SolanaAction(signer, this.root, web3_js_1.SystemProgram.transfer({
             fromPubkey: signer,
             toPubkey: recipient,
-            lamports: BigInt(amount.toString(10))
+            lamports: amount
         }), SolanaTokens.CUCosts.TRANSFER_SOL);
     }
     /**
@@ -98,7 +83,7 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
     Transfer(signer, recipient, token, amount) {
         const srcAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer, true);
         const dstAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, recipient, true);
-        return new SolanaAction_1.SolanaAction(signer, this.root, (0, spl_token_1.createTransferInstruction)(srcAta, dstAta, signer, BigInt(amount.toString(10))), SolanaTokens.CUCosts.TRANSFER);
+        return new SolanaAction_1.SolanaAction(signer, this.root, (0, spl_token_1.createTransferInstruction)(srcAta, dstAta, signer, amount), SolanaTokens.CUCosts.TRANSFER);
     }
     /**
      * Creates transactions for sending SOL (the native token)
@@ -109,23 +94,21 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @param feeRate fee rate to use for the transactions
      * @private
      */
-    txsTransferSol(signer, amount, recipient, feeRate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wsolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(this.WSOL_ADDRESS, signer, true);
-            const shouldUnwrap = yield this.ataExists(wsolAta);
-            const action = new SolanaAction_1.SolanaAction(signer, this.root);
-            if (shouldUnwrap) {
-                feeRate = feeRate || (yield this.root.Fees.getFeeRate([signer, recipient, wsolAta]));
-                action.add(this.Unwrap(signer));
-            }
-            else {
-                feeRate = feeRate || (yield this.root.Fees.getFeeRate([signer, recipient]));
-            }
-            action.add(this.SolTransfer(signer, recipient, amount));
-            this.logger.debug("txsTransferSol(): transfer native solana TX created, recipient: " + recipient.toString() +
-                " amount: " + amount.toString(10) + " unwrapping: " + shouldUnwrap);
-            return [yield action.tx(feeRate)];
-        });
+    async txsTransferSol(signer, amount, recipient, feeRate) {
+        const wsolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(SolanaTokens.WSOL_ADDRESS, signer, true);
+        const shouldUnwrap = await this.ataExists(wsolAta);
+        const action = new SolanaAction_1.SolanaAction(signer, this.root);
+        if (shouldUnwrap) {
+            feeRate = feeRate || await this.root.Fees.getFeeRate([signer, recipient, wsolAta]);
+            action.add(this.Unwrap(signer));
+        }
+        else {
+            feeRate = feeRate || await this.root.Fees.getFeeRate([signer, recipient]);
+        }
+        action.add(this.SolTransfer(signer, recipient, amount));
+        this.logger.debug("txsTransferSol(): transfer native solana TX created, recipient: " + recipient.toString() +
+            " amount: " + amount.toString(10) + " unwrapping: " + shouldUnwrap);
+        return [await action.tx(feeRate)];
     }
     /**
      * Creates transactions for sending the over the tokens
@@ -137,21 +120,19 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @param feeRate fee rate to use for the transactions
      * @private
      */
-    txsTransferTokens(signer, token, amount, recipient, feeRate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const srcAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer, true);
-            const dstAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, recipient, true);
-            feeRate = feeRate || (yield this.root.Fees.getFeeRate([signer, srcAta, dstAta]));
-            const initAta = !(yield this.ataExists(dstAta));
-            const action = new SolanaAction_1.SolanaAction(signer, this.root);
-            if (initAta) {
-                action.add(this.InitAta(signer, recipient, token));
-            }
-            action.add(this.Transfer(signer, recipient, token, amount));
-            this.logger.debug("txsTransferTokens(): transfer TX created, recipient: " + recipient.toString() +
-                " token: " + token.toString() + " amount: " + amount.toString(10) + " initAta: " + initAta);
-            return [yield action.tx(feeRate)];
-        });
+    async txsTransferTokens(signer, token, amount, recipient, feeRate) {
+        const srcAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer, true);
+        const dstAta = (0, spl_token_1.getAssociatedTokenAddressSync)(token, recipient, true);
+        feeRate = feeRate || await this.root.Fees.getFeeRate([signer, srcAta, dstAta]);
+        const initAta = !await this.ataExists(dstAta);
+        const action = new SolanaAction_1.SolanaAction(signer, this.root);
+        if (initAta) {
+            action.add(this.InitAta(signer, recipient, token));
+        }
+        action.add(this.Transfer(signer, recipient, token, amount));
+        this.logger.debug("txsTransferTokens(): transfer TX created, recipient: " + recipient.toString() +
+            " token: " + token.toString() + " amount: " + amount.toString(10) + " initAta: " + initAta);
+        return [await action.tx(feeRate)];
     }
     ///////////////////
     //// Tokens
@@ -186,17 +167,15 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      *
      * @param ata
      */
-    ataExists(ata) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const account = yield (0, Utils_1.tryWithRetries)(() => this.getATAOrNull(ata), this.retryPolicy);
-            return account != null;
-        });
+    async ataExists(ata) {
+        const account = await (0, Utils_1.tryWithRetries)(() => this.getATAOrNull(ata), this.retryPolicy);
+        return account != null;
     }
     /**
      * Returns the rent exempt deposit required to initiate the ATA
      */
     getATARentExemptLamports() {
-        return Promise.resolve(new BN(this.SPL_ATA_RENT_EXEMPT));
+        return Promise.resolve(BigInt(SolanaTokens.SPL_ATA_RENT_EXEMPT));
     }
     /**
      * Returns the token balance of the public key
@@ -204,35 +183,33 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @param publicKey
      * @param token
      */
-    getTokenBalance(publicKey, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, publicKey, true);
-            const [ataAccount, balance] = yield Promise.all([
-                this.getATAOrNull(ata),
-                (token != null && token.equals(this.WSOL_ADDRESS)) ? this.connection.getBalance(publicKey) : Promise.resolve(null)
-            ]);
-            let ataExists = ataAccount != null;
-            let sum = new BN(0);
-            if (ataExists) {
-                sum = sum.add(new BN(ataAccount.amount.toString()));
-            }
-            if (balance != null) {
-                let balanceLamports = new BN(balance);
-                if (!ataExists)
-                    balanceLamports = balanceLamports.sub(yield this.getATARentExemptLamports());
-                if (!balanceLamports.isNeg())
-                    sum = sum.add(balanceLamports);
-            }
-            this.logger.debug("getTokenBalance(): token balance fetched, token: " + token.toString() +
-                " address: " + publicKey.toString() + " amount: " + sum.toString());
-            return { balance: sum, ataExists };
-        });
+    async getTokenBalance(publicKey, token) {
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, publicKey, true);
+        const [ataAccount, balance] = await Promise.all([
+            this.getATAOrNull(ata),
+            (token != null && token.equals(SolanaTokens.WSOL_ADDRESS)) ? this.connection.getBalance(publicKey) : Promise.resolve(null)
+        ]);
+        let ataExists = ataAccount != null;
+        let sum = 0n;
+        if (ataExists) {
+            sum += ataAccount.amount;
+        }
+        if (balance != null) {
+            let balanceLamports = BigInt(balance);
+            if (!ataExists)
+                balanceLamports = balanceLamports - await this.getATARentExemptLamports();
+            if (balanceLamports >= 0n)
+                sum += balanceLamports;
+        }
+        this.logger.debug("getTokenBalance(): token balance fetched, token: " + token.toString() +
+            " address: " + publicKey.toString() + " amount: " + sum.toString());
+        return { balance: sum, ataExists };
     }
     /**
      * Returns the native currency address, we use WSOL address as placeholder for SOL
      */
     getNativeCurrencyAddress() {
-        return this.WSOL_ADDRESS;
+        return SolanaTokens.WSOL_ADDRESS;
     }
     /**
      * Parses string base58 representation of the token address to a PublicKey object
@@ -253,7 +230,7 @@ class SolanaTokens extends SolanaModule_1.SolanaModule {
      * @param feeRate fee rate to use for the transaction
      */
     txsTransfer(signer, token, amount, dstAddress, feeRate) {
-        if (this.WSOL_ADDRESS.equals(token)) {
+        if (SolanaTokens.WSOL_ADDRESS.equals(token)) {
             return this.txsTransferSol(signer, amount, dstAddress, feeRate);
         }
         return this.txsTransferTokens(signer, token, amount, dstAddress, feeRate);
@@ -267,3 +244,5 @@ SolanaTokens.CUCosts = {
     TRANSFER: 50000,
     TRANSFER_SOL: 5000
 };
+SolanaTokens.WSOL_ADDRESS = new web3_js_1.PublicKey("So11111111111111111111111111111111111111112");
+SolanaTokens.SPL_ATA_RENT_EXEMPT = 2039280;

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

@@ -80,7 +80,7 @@ export declare class SolanaTransactions extends SolanaModule {
      *  optionally waits for confirmation of a batch of solana transactions
      *
      * @param signer
-     * @param txs transactions to send
+     * @param _txs
      * @param waitForConfirmation whether to wait for transaction confirmations (this also makes sure the transactions
      *  are re-sent at regular intervals)
      * @param abortSignal abort signal to abort waiting for transaction confirmations
@@ -88,7 +88,7 @@ export declare class SolanaTransactions extends SolanaModule {
      *  are executed in order)
      * @param onBeforePublish a callback called before every transaction is published
      */
-    sendAndConfirm(signer: SolanaSigner, txs: SolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    sendAndConfirm(signer: SolanaSigner, _txs: SolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
     /**
      * Serializes the solana transaction, saves the transaction, signers & last valid blockheight
      *