@debridge-finance/solana-utils 5.5.0 → 6.0.0

package/LICENSE

@@ -1,100 +1,100 @@
-Business Source License 1.1
-
-License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
-"Business Source License" is a trademark of MariaDB Corporation Ab.
-
------------------------------------------------------------------------------
-
-Parameters
-
-Licensor:             DxTech Inc. (Company No.155728732)
-
-Licensed Work:        deBridge V1
-                      The Licensed Work is (c) 2021 DxTech Inc.
-
-Additional Use Grant: Any uses listed and defined at
-                      v1-license-grants.dbr.eth
-
-Change Date:          The earlier of 31 December 2025 or a date specified at
-                      v1-license-date.dbr.eth
-
-Change License:       GNU General Public License v2.0 or later
-
------------------------------------------------------------------------------
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited
-production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
-
-MariaDB hereby grants you permission to use this License’s text to license
-your works, and to refer to it using the trademark "Business Source License",
-as long as you comply with the Covenants of Licensor below.
-
------------------------------------------------------------------------------
-
-Covenants of Licensor
-
-In consideration of the right to use this License’s text and the "Business
-Source License" name and trademark, Licensor covenants to MariaDB, and to all
-other recipients of the licensed work to be provided by Licensor:
-
-1. To specify as the Change License the GPL Version 2.0 or any later version,
-   or a license that is compatible with GPL Version 2.0 or a later version,
-   where "compatible" means that software provided under the Change License can
-   be included in a program with software provided under GPL Version 2.0 or a
-   later version. Licensor may specify additional Change Licenses without
-   limitation.
-
-2. To either: (a) specify an additional grant of rights to use that does not
-   impose any additional restriction on the right granted in this License, as
-   the Additional Use Grant; or (b) insert the text "None".
-
-3. To specify a Change Date.
-
-4. Not to modify this License in any other way.
-
------------------------------------------------------------------------------
-
-Notice
-
-The Business Source License (this document, or the "License") is not an Open
-Source license. However, the Licensed Work will eventually be made available
-under an Open Source License, as stated in this License.
+Business Source License 1.1
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+"Business Source License" is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Parameters
+
+Licensor:             DxTech Inc. (Company No.155728732)
+
+Licensed Work:        deBridge V1
+                      The Licensed Work is (c) 2021 DxTech Inc.
+
+Additional Use Grant: Any uses listed and defined at
+                      v1-license-grants.dbr.eth
+
+Change Date:          The earlier of 31 December 2025 or a date specified at
+                      v1-license-date.dbr.eth
+
+Change License:       GNU General Public License v2.0 or later
+
+-----------------------------------------------------------------------------
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark "Business Source License",
+as long as you comply with the Covenants of Licensor below.
+
+-----------------------------------------------------------------------------
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the "Business
+Source License" name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where "compatible" means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text "None".
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
+
+-----------------------------------------------------------------------------
+
+Notice
+
+The Business Source License (this document, or the "License") is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.

package/README.md

@@ -1,3 +1,3 @@
-# `solana-utils` by deBridge
-
-Common utils package to power communication with Solana contracts at [deBridge](https://debridge.finance).
+# `solana-utils` by deBridge
+
+Common utils package to power communication with Solana contracts at [deBridge](https://debridge.finance).

package/dist/browser/index.js

@@ -7437,13 +7437,7 @@ const TOKEN_METADATA_PROGRAM_ID = new PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzj
 const TOKEN_PROGRAM_ID$1 = new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
 const ASSOCIATED_TOKEN_PROGRAM_ID = new PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
 const WRAPPED_SOL_MINT = new PublicKey("So11111111111111111111111111111111111111112");
-function findAssociatedTokenAddress(wallet, tokenMint, tokenProgramId = TOKEN_PROGRAM_ID$1, associatedTokenProramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
-    return PublicKey.findProgramAddressSync([wallet.toBytes(), tokenProgramId.toBytes(), tokenMint.toBytes()], associatedTokenProramId);
-}
-/**
- * @deprecated same as findAssociatedTokenAddress
- */
-function findAssociatedTokenAddressSync(wallet, tokenMint, tokenProgramId = TOKEN_PROGRAM_ID$1, associatedTokenProramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
+function findAssociatedTokenAddress(wallet, tokenMint, tokenProgramId, associatedTokenProramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
     return PublicKey.findProgramAddressSync([wallet.toBytes(), tokenProgramId.toBytes(), tokenMint.toBytes()], associatedTokenProramId);
 }
 function getTokenMetadataAddress(tokenMint, tokenMetadataProgramId) {
@@ -11523,15 +11517,15 @@ function parseSplAccount(dataOrInfo) {
         return AccountLayout.decode(data);
     }
     catch (e) {
-        console.error(e);
+        //console.error(e);
     }
     return null;
 }
-function isWalletCorrectATA(walletAddress, data) {
+function isWalletCorrectATA(walletAddress, data, ownerProgram) {
     const decoded = parseSplAccount(data);
     if (!decoded)
         return false;
-    const [realAta] = findAssociatedTokenAddress(decoded.owner, decoded.mint);
+    const [realAta] = findAssociatedTokenAddress(decoded.owner, decoded.mint, ownerProgram);
     return realAta.equals(new PublicKey(walletAddress));
 }
 /**
@@ -11546,7 +11540,7 @@ function getAccountWithType(connection, account) {
         if (!accountData)
             return [null, AccountType.NotExists];
         if (accountData.owner.equals(TOKEN_PROGRAM_ID$1)) {
-            return isWalletCorrectATA(account, accountData.data)
+            return isWalletCorrectATA(account, accountData.data, accountData.owner)
                 ? [accountData, AccountType.CorrectATA]
                 : [accountData, AccountType.Token];
         }
@@ -11556,18 +11550,7 @@ function getAccountWithType(connection, account) {
     });
 }
 /**
- * Returns balance of specified wallet in native tokens
- * @param wallet wallet to inspect
- */
-function getNativeWalletBalance(connection, wallet) {
-    return __awaiter(this, void 0, void 0, function* () {
-        wallet = new PublicKey(wallet);
-        const result = yield connection.getBalance(wallet);
-        return new BN(result.toString());
-    });
-}
-/**
- * Returns balance of associated wallet in SPL-tokens
+ * Returns balance of associated wallet in SPL-tokens (finds correct ata (token/token22))
  * @param originalWallet native tokens wallet address
  * @param tokenMint mint of SPL-Token
  */
@@ -11575,20 +11558,80 @@ function getAssocSPLWalletBalance(connection, originalWallet, tokenMint) {
     return __awaiter(this, void 0, void 0, function* () {
         originalWallet = new PublicKey(originalWallet);
         tokenMint = new PublicKey(tokenMint);
-        const [wallet] = findAssociatedTokenAddress(originalWallet, tokenMint);
-        const result = yield connection.getTokenAccountBalance(wallet, "finalized");
-        return new BN(result.value.amount);
+        const [wallet] = findAssociatedTokenAddress(originalWallet, tokenMint, TOKEN_PROGRAM_ID$1);
+        const [wallet22] = findAssociatedTokenAddress(originalWallet, tokenMint, TOKEN_2022_PROGRAM_ID);
+        const [tokenMintInfo, walletInfo, wallet22Info] = yield connection.getMultipleAccountsInfo([tokenMint, wallet, wallet22]);
+        if (!tokenMintInfo) {
+            throw new Error("Mint doesn't exist");
+        }
+        const owner = tokenMintInfo.owner.toBase58();
+        switch (owner) {
+            case TOKEN_PROGRAM_ID$1.toBase58(): {
+                if (walletInfo == null || walletInfo == undefined)
+                    return null;
+                const spl = parseSplAccount(walletInfo);
+                return {
+                    balance: walletInfo.lamports,
+                    spl: spl
+                        ? {
+                            balance: spl.amount,
+                            isToken22: false,
+                            mint: spl.mint,
+                            owner: spl.owner,
+                        }
+                        : undefined,
+                };
+            }
+            case TOKEN_2022_PROGRAM_ID.toBase58(): {
+                if (wallet22Info == null || wallet22Info == undefined)
+                    return null;
+                const spl = parseSplAccount(wallet22Info);
+                return {
+                    balance: wallet22Info.lamports,
+                    spl: spl
+                        ? {
+                            balance: spl.amount,
+                            isToken22: false,
+                            mint: spl.mint,
+                            owner: spl.owner,
+                        }
+                        : undefined,
+                };
+            }
+            default: {
+                throw new Error(`Unexpected tokenMint owner: ${owner}`);
+            }
+        }
     });
 }
 /**
- * Returns balance of specified wallet in SPL-tokens
+ * Returns balance of specified wallets. null if account doesn't exist
  * @param wallet spl-tokens wallet address
  */
-function getSPLWalletBalance(connection, wallet) {
+function getWalletsBalances(connection, wallets) {
     return __awaiter(this, void 0, void 0, function* () {
-        wallet = new PublicKey(wallet);
-        const result = yield connection.getTokenAccountBalance(wallet, "finalized");
-        return new BN(result.value.amount);
+        const infos = yield connection.getMultipleAccountsInfo(wallets.map((w) => new PublicKey(w)), "finalized");
+        const results = [];
+        for (const info of infos) {
+            if (!info || info.lamports === 0) {
+                results.push(null);
+                continue;
+            }
+            const parsed = parseSplAccount(info.data);
+            const result = {
+                balance: info.lamports,
+            };
+            if (parsed) {
+                result.spl = {
+                    balance: parsed.amount,
+                    isToken22: info.owner.toBase58() === TOKEN_2022_PROGRAM_ID.toBase58(),
+                    mint: parsed.mint,
+                    owner: parsed.owner,
+                };
+            }
+            results.push(result);
+        }
+        return results;
     });
 }
 /**
@@ -11691,11 +11734,11 @@ function updateWsolBalance(connection, amount, owner) {
     return __awaiter(this, void 0, void 0, function* () {
         owner = new PublicKey(owner);
         const tx = new Transaction();
-        const [wSolATA] = findAssociatedTokenAddress(owner, WRAPPED_SOL_MINT);
+        const [wSolATA] = findAssociatedTokenAddress(owner, WRAPPED_SOL_MINT, TOKEN_PROGRAM_ID$1);
         const existingATA = yield getAccountInfo(connection, wSolATA);
         let amountToWrap = new BN(amount);
         if (existingATA === null) {
-            tx.add(createAssociatedWalletInstruction(WRAPPED_SOL_MINT, wSolATA, owner, owner));
+            tx.add(createAssociatedWalletInstruction(WRAPPED_SOL_MINT, wSolATA, owner, owner, false));
         }
         else {
             const parsed = parseSplAccount(existingATA.data);
@@ -11711,19 +11754,6 @@ function updateWsolBalance(connection, amount, owner) {
         return tx;
     });
 }
-/**
- * Checks existance of associated wallet for specified token
- * @param mintAccount mint account of SPL-token
- * @param originalWallet account of solana wallet
- * @returns true if account exists
- */
-function checkIfAssociatedWalletExists(connection, mintAccount, originalWallet) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const [walletAccount] = findAssociatedTokenAddress(originalWallet, mintAccount);
-        const accountData = yield getAccountInfo(connection, walletAccount);
-        return accountData !== null;
-    });
-}
 function getTransactionAccountsForSimulationDiff(connection, tx) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -11766,12 +11796,13 @@ function getTransactionAccountsForSimulationDiff(connection, tx) {
 }
 function parseMultipleAccounts(accounts) {
     return accounts.map((account) => {
-        var _a, _b;
         let parsedSplAccount;
+        let isToken22 = false;
         if (account) {
-            const owner = new PublicKey(account.owner);
-            if (owner.equals(TOKEN_PROGRAM_ID$1) ||
-                owner.equals(TOKEN_2022_PROGRAM_ID)) {
+            const owner = new PublicKey(account.owner).toBase58();
+            isToken22 = owner == TOKEN_2022_PROGRAM_ID.toBase58();
+            // pubkey.equals might not work
+            if (isToken22 || TOKEN_PROGRAM_ID$1.toBase58() == owner) {
                 if (account.data instanceof buffer.Buffer) {
                     parsedSplAccount = parseSplAccount(account.data);
                 }
@@ -11780,14 +11811,18 @@ function parseMultipleAccounts(accounts) {
                 }
             }
         }
+        else {
+            return null;
+        }
         const parsedAccount = {
-            balance: (_a = account === null || account === void 0 ? void 0 : account.lamports) !== null && _a !== void 0 ? _a : 0,
+            balance: account.lamports,
         };
         if (parsedSplAccount) {
             parsedAccount.spl = {
                 mint: parsedSplAccount.mint,
                 owner: parsedSplAccount.owner,
-                balance: (_b = parsedSplAccount.amount) !== null && _b !== void 0 ? _b : BigInt(0),
+                balance: parsedSplAccount.amount,
+                isToken22,
             };
         }
         return parsedAccount;
@@ -11821,7 +11856,7 @@ function getTransactionDiff(connection, tx, txAccounts) {
                 },
             }),
         ]);
-        if (simulatedTx.value.err !== null)
+        if (simulatedTx.value.err !== null || !simulatedTx.value.accounts)
             throw new Error(JSON.stringify({
                 err: simulatedTx.value.err,
                 logs: simulatedTx.value.logs,
@@ -11863,16 +11898,13 @@ var spl = /*#__PURE__*/Object.freeze({
 	getTokenInfo: getTokenInfo,
 	createAssociatedWalletInstruction: createAssociatedWalletInstruction,
 	parseSplAccount: parseSplAccount,
-	isWalletCorrectATA: isWalletCorrectATA,
 	getAccountWithType: getAccountWithType,
-	getNativeWalletBalance: getNativeWalletBalance,
 	getAssocSPLWalletBalance: getAssocSPLWalletBalance,
-	getSPLWalletBalance: getSPLWalletBalance,
+	getWalletsBalances: getWalletsBalances,
 	getAllTokenAccountsWithBalances: getAllTokenAccountsWithBalances,
 	getTokenAccountsWithBalance: getTokenAccountsWithBalance,
 	buildReplenishWsolBalanceTransaction: buildReplenishWsolBalanceTransaction,
 	updateWsolBalance: updateWsolBalance,
-	checkIfAssociatedWalletExists: checkIfAssociatedWalletExists,
 	getTransactionAccountsForSimulationDiff: getTransactionAccountsForSimulationDiff,
 	parseMultipleAccounts: parseMultipleAccounts,
 	getSplDiff: getSplDiff,
@@ -29287,5 +29319,5 @@ var transaction = /*#__PURE__*/Object.freeze({
 	getErrorData: getErrorData
 });
 
-export { ASSOCIATED_TOKEN_PROGRAM_ID, DeBridgeResolver, TOKEN_2022_PROGRAM_ID, TOKEN_METADATA_PROGRAM_ID, TOKEN_PROGRAM_ID$1 as TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT, constants$1 as constants, crypto$1 as crypto, dlnDstResolver, dlnSrcResolver, findAssociatedTokenAddress, findAssociatedTokenAddressSync, getTokenMetadataAddress, helpers, interfaces, programs, spl, transaction as txs };
+export { ASSOCIATED_TOKEN_PROGRAM_ID, DeBridgeResolver, TOKEN_2022_PROGRAM_ID, TOKEN_METADATA_PROGRAM_ID, TOKEN_PROGRAM_ID$1 as TOKEN_PROGRAM_ID, WRAPPED_SOL_MINT, constants$1 as constants, crypto$1 as crypto, dlnDstResolver, dlnSrcResolver, findAssociatedTokenAddress, getTokenMetadataAddress, helpers, interfaces, programs, spl, transaction as txs };
 //# sourceMappingURL=index.js.map