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

package/dist/solana/swaps/modules/SolanaDataAccount.js

@@ -1,13 +1,4 @@
 "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.SolanaDataAccount = exports.StoredDataAccount = void 0;
 const SolanaSwapModule_1 = require("../SolanaSwapModule");
@@ -16,7 +7,6 @@ const SolanaAction_1 = require("../../base/SolanaAction");
 const Utils_1 = require("../../../utils/Utils");
 const randomBytes = require("randombytes");
 const SolanaSigner_1 = require("../../wallet/SolanaSigner");
-const BN = require("bn.js");
 class StoredDataAccount {
     constructor(accountKeyOrData, owner) {
         if (accountKeyOrData instanceof web3_js_1.PublicKey) {
@@ -45,27 +35,25 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
      * @param dataLength
      * @private
      */
-    InitDataAccount(signer, accountKey, dataLength) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const accountSize = 32 + dataLength;
-            const lamportsDeposit = yield (0, Utils_1.tryWithRetries)(() => this.connection.getMinimumBalanceForRentExemption(accountSize), this.retryPolicy);
-            return new SolanaAction_1.SolanaAction(signer, this.root, [
-                web3_js_1.SystemProgram.createAccount({
-                    fromPubkey: signer,
-                    newAccountPubkey: accountKey.publicKey,
-                    lamports: lamportsDeposit,
-                    space: accountSize,
-                    programId: this.program.programId
-                }),
-                yield this.program.methods
-                    .initData()
-                    .accounts({
-                    signer,
-                    data: accountKey.publicKey
-                })
-                    .instruction(),
-            ], SolanaDataAccount.CUCosts.DATA_CREATE, null, [accountKey]);
-        });
+    async InitDataAccount(signer, accountKey, dataLength) {
+        const accountSize = 32 + dataLength;
+        const lamportsDeposit = await (0, Utils_1.tryWithRetries)(() => this.connection.getMinimumBalanceForRentExemption(accountSize), this.retryPolicy);
+        return new SolanaAction_1.SolanaAction(signer, this.root, [
+            web3_js_1.SystemProgram.createAccount({
+                fromPubkey: signer,
+                newAccountPubkey: accountKey.publicKey,
+                lamports: lamportsDeposit,
+                space: accountSize,
+                programId: this.program.programId
+            }),
+            await this.program.methods
+                .initData()
+                .accounts({
+                signer,
+                data: accountKey.publicKey
+            })
+                .instruction(),
+        ], SolanaDataAccount.CUCosts.DATA_CREATE, null, [accountKey]);
     }
     /**
      * Action for closing the specific data account
@@ -73,16 +61,14 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
      * @param signer
      * @param publicKey
      */
-    CloseDataAccount(signer, publicKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new SolanaAction_1.SolanaAction(signer, this.root, yield this.program.methods
-                .closeData()
-                .accounts({
-                signer,
-                data: publicKey
-            })
-                .instruction(), SolanaDataAccount.CUCosts.DATA_REMOVE, yield this.root.Fees.getFeeRate([signer, publicKey]));
-        });
+    async CloseDataAccount(signer, publicKey) {
+        return new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+            .closeData()
+            .accounts({
+            signer,
+            data: publicKey
+        })
+            .instruction(), SolanaDataAccount.CUCosts.DATA_REMOVE, await this.root.Fees.getFeeRate([signer, publicKey]));
     }
     /**
      * Action for writing data to a data account, writes up to sizeLimit starting from the offset position of the
@@ -96,20 +82,18 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
      * @private
      * @returns {Promise<{bytesWritten: number, action: SolanaAction}>} bytes written to the data account & action
      */
-    WriteData(signer, accountKey, writeData, offset, sizeLimit) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const writeLen = Math.min(writeData.length - offset, sizeLimit);
-            return {
-                bytesWritten: writeLen,
-                action: new SolanaAction_1.SolanaAction(signer, this.root, yield this.program.methods
-                    .writeData(offset, writeData.slice(offset, offset + writeLen))
-                    .accounts({
-                    signer,
-                    data: accountKey.publicKey
-                })
-                    .instruction(), SolanaDataAccount.CUCosts.DATA_WRITE)
-            };
-        });
+    async WriteData(signer, accountKey, writeData, offset, sizeLimit) {
+        const writeLen = Math.min(writeData.length - offset, sizeLimit);
+        return {
+            bytesWritten: writeLen,
+            action: new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+                .writeData(offset, writeData.slice(offset, offset + writeLen))
+                .accounts({
+                signer,
+                data: accountKey.publicKey
+            })
+                .instruction(), SolanaDataAccount.CUCosts.DATA_WRITE)
+        };
     }
     constructor(root, storage) {
         super(root);
@@ -131,12 +115,10 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
     /**
      * Initializes the data account handler, loads the existing data accounts which should be checked and closed
      */
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.storage.init();
-            const loadedData = yield this.storage.loadData(StoredDataAccount);
-            this.logger.info("init(): initialized & loaded stored data accounts, count: " + loadedData.length);
-        });
+    async init() {
+        await this.storage.init();
+        const loadedData = await this.storage.loadData(StoredDataAccount);
+        this.logger.info("init(): initialized & loaded stored data accounts, count: " + loadedData.length);
     }
     /**
      * Removes data account from the list of accounts that should be checked for reclaiming the locked SOL, this should
@@ -147,59 +129,55 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
     removeDataAccount(publicKey) {
         return this.storage.removeData(publicKey.toBase58());
     }
-    getDataAccountsInfo(signer) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const closePublicKeys = [];
-            let totalLocked = new BN(0);
-            for (let key in this.storage.data) {
-                const { accountKey, owner } = this.storage.data[key];
-                if (!owner.equals(signer))
+    async getDataAccountsInfo(signer) {
+        const closePublicKeys = [];
+        let totalLocked = 0n;
+        for (let key in this.storage.data) {
+            const { accountKey, owner } = this.storage.data[key];
+            if (!owner.equals(signer))
+                continue;
+            try {
+                const fetchedDataAccount = await this.connection.getAccountInfo(accountKey);
+                if (fetchedDataAccount == null) {
+                    await this.removeDataAccount(accountKey);
                     continue;
-                try {
-                    const fetchedDataAccount = yield this.connection.getAccountInfo(accountKey);
-                    if (fetchedDataAccount == null) {
-                        yield this.removeDataAccount(accountKey);
-                        continue;
-                    }
-                    closePublicKeys.push(accountKey);
-                    totalLocked = totalLocked.add(new BN(fetchedDataAccount.lamports));
                 }
-                catch (e) { }
+                closePublicKeys.push(accountKey);
+                totalLocked += BigInt(fetchedDataAccount.lamports);
             }
-            return {
-                closePublicKeys,
-                count: closePublicKeys.length,
-                totalValue: totalLocked
-            };
-        });
+            catch (e) { }
+        }
+        return {
+            closePublicKeys,
+            count: closePublicKeys.length,
+            totalValue: totalLocked
+        };
     }
     /**
      * Sweeps all old data accounts, reclaiming the SOL locked in the PDAs
      */
-    sweepDataAccounts(signer) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { closePublicKeys, totalValue } = yield this.getDataAccountsInfo(signer.getPublicKey());
-            if (closePublicKeys.length === 0) {
-                this.logger.debug("sweepDataAccounts(): no old data accounts found, no need to close any!");
-                return;
-            }
-            this.logger.debug("sweepDataAccounts(): closing old data accounts: ", closePublicKeys);
-            let txns = [];
-            for (let publicKey of closePublicKeys) {
-                yield (yield this.CloseDataAccount(signer.getPublicKey(), publicKey)).addToTxs(txns);
-            }
-            const result = yield this.root.Transactions.sendAndConfirm(signer, txns, true, null, true);
-            this.logger.info("sweepDataAccounts(): old data accounts closed: " +
-                closePublicKeys.map(pk => pk.toBase58()).join());
-            for (let publicKey of closePublicKeys) {
-                yield this.removeDataAccount(publicKey);
-            }
-            return {
-                txIds: result,
-                count: closePublicKeys.length,
-                totalValue: totalValue
-            };
-        });
+    async sweepDataAccounts(signer) {
+        const { closePublicKeys, totalValue } = await this.getDataAccountsInfo(signer.getPublicKey());
+        if (closePublicKeys.length === 0) {
+            this.logger.debug("sweepDataAccounts(): no old data accounts found, no need to close any!");
+            return;
+        }
+        this.logger.debug("sweepDataAccounts(): closing old data accounts: ", closePublicKeys);
+        let txns = [];
+        for (let publicKey of closePublicKeys) {
+            await (await this.CloseDataAccount(signer.getPublicKey(), publicKey)).addToTxs(txns);
+        }
+        const result = await this.root.Transactions.sendAndConfirm(signer, txns, true, null, true);
+        this.logger.info("sweepDataAccounts(): old data accounts closed: " +
+            closePublicKeys.map(pk => pk.toBase58()).join());
+        for (let publicKey of closePublicKeys) {
+            await this.removeDataAccount(publicKey);
+        }
+        return {
+            txIds: result,
+            count: closePublicKeys.length,
+            totalValue: totalValue
+        };
     }
     /**
      * Adds the transactions writing (and also initializing if it doesn't exist) data to the data account
@@ -210,40 +188,38 @@ class SolanaDataAccount extends SolanaSwapModule_1.SolanaSwapModule {
      * @param txs solana transactions array, where txns for writing & initializing will be added
      * @param feeRate fee rate to use for the transactions
      */
-    addTxsWriteData(signer, reversedTxId, writeData, txs, feeRate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let txDataKey;
-            let fetchedDataAccount = null;
-            if (signer instanceof SolanaSigner_1.SolanaSigner && signer.keypair != null) {
-                txDataKey = this.SwapTxDataAlt(reversedTxId, signer.keypair);
-                fetchedDataAccount = yield (0, Utils_1.tryWithRetries)(() => this.connection.getAccountInfo(txDataKey.publicKey), this.retryPolicy);
-            }
-            else {
-                const secret = randomBytes(32);
-                txDataKey = this.SwapTxDataAltBuffer(reversedTxId, secret);
-            }
-            const signerKey = signer instanceof SolanaSigner_1.SolanaSigner ? signer.getPublicKey() : signer;
-            let pointer = 0;
-            if (fetchedDataAccount == null) {
-                const action = new SolanaAction_1.SolanaAction(signerKey, this.root);
-                action.add(yield this.InitDataAccount(signerKey, txDataKey, writeData.length));
-                const { bytesWritten, action: writeAction } = yield this.WriteData(signerKey, txDataKey, writeData, pointer, 420);
-                this.logger.debug("addTxsWriteData(): Write partial data (" + pointer + " .. " + (pointer + bytesWritten) + ")/" + writeData.length +
-                    " key: " + txDataKey.publicKey.toBase58());
-                pointer += bytesWritten;
-                action.add(writeAction);
-                yield action.addToTxs(txs, feeRate);
-                yield this.saveDataAccount(signerKey, txDataKey.publicKey);
-            }
-            while (pointer < writeData.length) {
-                const { bytesWritten, action } = yield this.WriteData(signerKey, txDataKey, writeData, pointer, 950);
-                this.logger.debug("addTxsWriteData(): Write partial data (" + pointer + " .. " + (pointer + bytesWritten) + ")/" + writeData.length +
-                    " key: " + txDataKey.publicKey.toBase58());
-                pointer += bytesWritten;
-                yield action.addToTxs(txs, feeRate);
-            }
-            return txDataKey.publicKey;
-        });
+    async addTxsWriteData(signer, reversedTxId, writeData, txs, feeRate) {
+        let txDataKey;
+        let fetchedDataAccount = null;
+        if (signer instanceof SolanaSigner_1.SolanaSigner && signer.keypair != null) {
+            txDataKey = this.SwapTxDataAlt(reversedTxId, signer.keypair);
+            fetchedDataAccount = await (0, Utils_1.tryWithRetries)(() => this.connection.getAccountInfo(txDataKey.publicKey), this.retryPolicy);
+        }
+        else {
+            const secret = randomBytes(32);
+            txDataKey = this.SwapTxDataAltBuffer(reversedTxId, secret);
+        }
+        const signerKey = signer instanceof SolanaSigner_1.SolanaSigner ? signer.getPublicKey() : signer;
+        let pointer = 0;
+        if (fetchedDataAccount == null) {
+            const action = new SolanaAction_1.SolanaAction(signerKey, this.root);
+            action.add(await this.InitDataAccount(signerKey, txDataKey, writeData.length));
+            const { bytesWritten, action: writeAction } = await this.WriteData(signerKey, txDataKey, writeData, pointer, 420);
+            this.logger.debug("addTxsWriteData(): Write partial data (" + pointer + " .. " + (pointer + bytesWritten) + ")/" + writeData.length +
+                " key: " + txDataKey.publicKey.toBase58());
+            pointer += bytesWritten;
+            action.add(writeAction);
+            await action.addToTxs(txs, feeRate);
+            await this.saveDataAccount(signerKey, txDataKey.publicKey);
+        }
+        while (pointer < writeData.length) {
+            const { bytesWritten, action } = await this.WriteData(signerKey, txDataKey, writeData, pointer, 950);
+            this.logger.debug("addTxsWriteData(): Write partial data (" + pointer + " .. " + (pointer + bytesWritten) + ")/" + writeData.length +
+                " key: " + txDataKey.publicKey.toBase58());
+            pointer += bytesWritten;
+            await action.addToTxs(txs, feeRate);
+        }
+        return txDataKey.publicKey;
     }
 }
 exports.SolanaDataAccount = SolanaDataAccount;

package/dist/solana/swaps/modules/SolanaLpVault.d.ts

@@ -1,5 +1,4 @@
 import { SolanaSwapModule } from "../SolanaSwapModule";
-import * as BN from "bn.js";
 import { PublicKey } from "@solana/web3.js";
 import { SolanaTx } from "../../base/modules/SolanaTransactions";
 import { IntermediaryReputationType } from "@atomiqlabs/base";
@@ -32,7 +31,7 @@ export declare class SolanaLpVault extends SolanaSwapModule {
      * @param token
      */
     getIntermediaryData(address: PublicKey, token: PublicKey): Promise<{
-        balance: BN;
+        balance: bigint;
         reputation: IntermediaryReputationType;
     }>;
     /**
@@ -48,7 +47,7 @@ export declare class SolanaLpVault extends SolanaSwapModule {
      * @param address
      * @param token
      */
-    getIntermediaryBalance(address: PublicKey, token: PublicKey): Promise<BN>;
+    getIntermediaryBalance(address: PublicKey, token: PublicKey): Promise<bigint>;
     /**
      * Creates transactions for withdrawing funds from the LP vault, creates ATA if it doesn't exist and unwraps
      *  WSOL to SOL if required
@@ -58,7 +57,7 @@ export declare class SolanaLpVault extends SolanaSwapModule {
      * @param amount
      * @param feeRate
      */
-    txsWithdraw(signer: PublicKey, token: PublicKey, amount: BN, feeRate?: string): Promise<SolanaTx[]>;
+    txsWithdraw(signer: PublicKey, token: PublicKey, amount: bigint, feeRate?: string): Promise<SolanaTx[]>;
     /**
      * Creates transaction for depositing funds into the LP vault, wraps SOL to WSOL if required
      *
@@ -67,6 +66,6 @@ export declare class SolanaLpVault extends SolanaSwapModule {
      * @param amount
      * @param feeRate
      */
-    txsDeposit(signer: PublicKey, token: PublicKey, amount: BN, feeRate?: string): Promise<SolanaTx[]>;
+    txsDeposit(signer: PublicKey, token: PublicKey, amount: bigint, feeRate?: string): Promise<SolanaTx[]>;
     getFeeRate(signer: PublicKey, token: PublicKey): Promise<string>;
 }

package/dist/solana/swaps/modules/SolanaLpVault.js

@@ -1,21 +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.SolanaLpVault = void 0;
 const SolanaSwapModule_1 = require("../SolanaSwapModule");
 const SolanaAction_1 = require("../../base/SolanaAction");
-const BN = require("bn.js");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const Utils_1 = require("../../../utils/Utils");
+const SolanaTokens_1 = require("../../base/modules/SolanaTokens");
 class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
     /**
      * Action for withdrawing funds from the LP vault
@@ -26,22 +17,20 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @constructor
      * @private
      */
-    Withdraw(signer, token, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
-            return new SolanaAction_1.SolanaAction(signer, this.root, yield this.program.methods
-                .withdraw(new BN(amount))
-                .accounts({
-                signer,
-                signerAta: ata,
-                userData: this.root.SwapUserVault(signer, token),
-                vault: this.root.SwapVault(token),
-                vaultAuthority: this.root.SwapVaultAuthority,
-                mint: token,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
-            })
-                .instruction(), SolanaLpVault.CUCosts.WITHDRAW);
-        });
+    async Withdraw(signer, token, amount) {
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
+        return new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+            .withdraw((0, Utils_1.toBN)(amount))
+            .accounts({
+            signer,
+            signerAta: ata,
+            userData: this.root.SwapUserVault(signer, token),
+            vault: this.root.SwapVault(token),
+            vaultAuthority: this.root.SwapVaultAuthority,
+            mint: token,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+        })
+            .instruction(), SolanaLpVault.CUCosts.WITHDRAW);
     }
     /**
      * Action for depositing funds to the LP vault
@@ -52,23 +41,21 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @constructor
      * @private
      */
-    Deposit(signer, token, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
-            return new SolanaAction_1.SolanaAction(signer, this.root, yield this.program.methods
-                .deposit(new BN(amount))
-                .accounts({
-                signer,
-                signerAta: ata,
-                userData: this.root.SwapUserVault(signer, token),
-                vault: this.root.SwapVault(token),
-                vaultAuthority: this.root.SwapVaultAuthority,
-                mint: token,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
-            })
-                .instruction(), SolanaLpVault.CUCosts.DEPOSIT);
-        });
+    async Deposit(signer, token, amount) {
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
+        return new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+            .deposit((0, Utils_1.toBN)(amount))
+            .accounts({
+            signer,
+            signerAta: ata,
+            userData: this.root.SwapUserVault(signer, token),
+            vault: this.root.SwapVault(token),
+            vaultAuthority: this.root.SwapVaultAuthority,
+            mint: token,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+        })
+            .instruction(), SolanaLpVault.CUCosts.DEPOSIT);
     }
     /**
      * Returns intermediary's reputation & vault balance for a specific token
@@ -76,27 +63,25 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @param address
      * @param token
      */
-    getIntermediaryData(address, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.program.account.userAccount.fetchNullable(this.root.SwapUserVault(address, token));
-            if (data == null)
-                return null;
-            const response = [];
-            for (let i = 0; i < data.successVolume.length; i++) {
-                response[i] = {
-                    successVolume: data.successVolume[i],
-                    successCount: data.successCount[i],
-                    failVolume: data.failVolume[i],
-                    failCount: data.failCount[i],
-                    coopCloseVolume: data.coopCloseVolume[i],
-                    coopCloseCount: data.coopCloseCount[i]
-                };
-            }
-            return {
-                balance: data.amount,
-                reputation: response
+    async getIntermediaryData(address, token) {
+        const data = await this.program.account.userAccount.fetchNullable(this.root.SwapUserVault(address, token));
+        if (data == null)
+            return null;
+        const response = [];
+        for (let i = 0; i < data.successVolume.length; i++) {
+            response[i] = {
+                successVolume: data.successVolume[i],
+                successCount: data.successCount[i],
+                failVolume: data.failVolume[i],
+                failCount: data.failCount[i],
+                coopCloseVolume: data.coopCloseVolume[i],
+                coopCloseCount: data.coopCloseCount[i]
             };
-        });
+        }
+        return {
+            balance: (0, Utils_1.toBigInt)(data.amount),
+            reputation: response
+        };
     }
     /**
      * Returns intermediary's reputation for a specific token
@@ -104,11 +89,9 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @param address
      * @param token
      */
-    getIntermediaryReputation(address, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const intermediaryData = yield this.getIntermediaryData(address, token);
-            return intermediaryData === null || intermediaryData === void 0 ? void 0 : intermediaryData.reputation;
-        });
+    async getIntermediaryReputation(address, token) {
+        const intermediaryData = await this.getIntermediaryData(address, token);
+        return intermediaryData?.reputation;
     }
     /**
      * Returns the balance of the token an intermediary has in his LP vault
@@ -116,14 +99,12 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @param address
      * @param token
      */
-    getIntermediaryBalance(address, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const intermediaryData = yield this.getIntermediaryData(address, token);
-            const balance = intermediaryData === null || intermediaryData === void 0 ? void 0 : intermediaryData.balance;
-            this.logger.debug("getIntermediaryBalance(): token LP balance fetched, token: " + token.toString() +
-                " address: " + address + " amount: " + (balance == null ? "null" : balance.toString()));
-            return intermediaryData === null || intermediaryData === void 0 ? void 0 : intermediaryData.balance;
-        });
+    async getIntermediaryBalance(address, token) {
+        const intermediaryData = await this.getIntermediaryData(address, token);
+        const balance = intermediaryData?.balance;
+        this.logger.debug("getIntermediaryBalance(): token LP balance fetched, token: " + token.toString() +
+            " address: " + address + " amount: " + (balance == null ? "null" : balance.toString()));
+        return balance;
     }
     /**
      * Creates transactions for withdrawing funds from the LP vault, creates ATA if it doesn't exist and unwraps
@@ -134,22 +115,20 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @param amount
      * @param feeRate
      */
-    txsWithdraw(signer, token, amount, feeRate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ata = yield (0, spl_token_1.getAssociatedTokenAddress)(token, signer);
-            feeRate = feeRate || (yield this.getFeeRate(signer, token));
-            const action = new SolanaAction_1.SolanaAction(signer, this.root);
-            if (!(yield this.root.Tokens.ataExists(ata))) {
-                action.add(this.root.Tokens.InitAta(signer, signer, token));
-            }
-            action.add(yield this.Withdraw(signer, token, amount));
-            const shouldUnwrap = token.equals(this.root.Tokens.WSOL_ADDRESS);
-            if (shouldUnwrap)
-                action.add(this.root.Tokens.Unwrap(signer));
-            this.logger.debug("txsWithdraw(): withdraw TX created, token: " + token.toString() +
-                " amount: " + amount.toString(10) + " unwrapping: " + shouldUnwrap);
-            return [yield action.tx(feeRate)];
-        });
+    async txsWithdraw(signer, token, amount, feeRate) {
+        const ata = await (0, spl_token_1.getAssociatedTokenAddress)(token, signer);
+        feeRate = feeRate || await this.getFeeRate(signer, token);
+        const action = new SolanaAction_1.SolanaAction(signer, this.root);
+        if (!await this.root.Tokens.ataExists(ata)) {
+            action.add(this.root.Tokens.InitAta(signer, signer, token));
+        }
+        action.add(await this.Withdraw(signer, token, amount));
+        const shouldUnwrap = token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS);
+        if (shouldUnwrap)
+            action.add(this.root.Tokens.Unwrap(signer));
+        this.logger.debug("txsWithdraw(): withdraw TX created, token: " + token.toString() +
+            " amount: " + amount.toString(10) + " unwrapping: " + shouldUnwrap);
+        return [await action.tx(feeRate)];
     }
     /**
      * Creates transaction for depositing funds into the LP vault, wraps SOL to WSOL if required
@@ -159,25 +138,23 @@ class SolanaLpVault extends SolanaSwapModule_1.SolanaSwapModule {
      * @param amount
      * @param feeRate
      */
-    txsDeposit(signer, token, amount, feeRate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
-            feeRate = feeRate || (yield this.getFeeRate(signer, token));
-            const action = new SolanaAction_1.SolanaAction(signer, this.root);
-            let wrapping = false;
-            if (token.equals(this.root.Tokens.WSOL_ADDRESS)) {
-                const account = yield (0, Utils_1.tryWithRetries)(() => this.root.Tokens.getATAOrNull(ata), this.retryPolicy);
-                let balance = account == null ? new BN(0) : new BN(account.amount.toString());
-                if (balance.lt(amount)) {
-                    action.add(this.root.Tokens.Wrap(signer, amount.sub(balance), account == null));
-                    wrapping = true;
-                }
+    async txsDeposit(signer, token, amount, feeRate) {
+        const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);
+        feeRate = feeRate || await this.getFeeRate(signer, token);
+        const action = new SolanaAction_1.SolanaAction(signer, this.root);
+        let wrapping = false;
+        if (token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS)) {
+            const account = await (0, Utils_1.tryWithRetries)(() => this.root.Tokens.getATAOrNull(ata), this.retryPolicy);
+            let balance = account == null ? 0n : account.amount;
+            if (balance < amount) {
+                action.add(this.root.Tokens.Wrap(signer, amount - balance, account == null));
+                wrapping = true;
             }
-            action.addAction(yield this.Deposit(signer, token, amount));
-            this.logger.debug("txsDeposit(): deposit TX created, token: " + token.toString() +
-                " amount: " + amount.toString(10) + " wrapping: " + wrapping);
-            return [yield action.tx(feeRate)];
-        });
+        }
+        action.addAction(await this.Deposit(signer, token, amount));
+        this.logger.debug("txsDeposit(): deposit TX created, token: " + token.toString() +
+            " amount: " + amount.toString(10) + " wrapping: " + wrapping);
+        return [await action.tx(feeRate)];
     }
     getFeeRate(signer, token) {
         const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(token, signer);