@debridge-finance/solana-utils 5.0.0 → 5.1.1

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

@@ -6504,8 +6504,8 @@ var constants = /*#__PURE__*/Object.freeze({
 	dlnDst: dlnDst$1
 });
 
-function getAccountInfo(connection, account, commitment = "confirmed") {
-    return __awaiter(this, void 0, void 0, function* () {
+function getAccountInfo(connection_1, account_1) {
+    return __awaiter(this, arguments, void 0, function* (connection, account, commitment = "confirmed") {
         const info = yield connection.getAccountInfo(account, commitment);
         if (info) {
             // alchemy bug fix
@@ -6598,8 +6598,8 @@ function setBlockhash(transaction, blockhash) {
     }
 }
 function simulateTx(connection, tx, commitment, feePayer, convertToV0, alreadySigned) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let convert = convertToV0 && !alreadySigned;
         let txCopy = isVersionedTx(tx)
             ? new VersionedTransaction(tx.message, tx.signatures)
@@ -6644,11 +6644,11 @@ function simulateTx(connection, tx, commitment, feePayer, convertToV0, alreadySi
  * @returns
  */
 function sendAll(connection, wallet, transactions, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g;
         const skipSign = (_a = options === null || options === void 0 ? void 0 : options.skipSign) !== null && _a !== void 0 ? _a : false;
         const blockhashCommitment = (options === null || options === void 0 ? void 0 : options.blockhashCommitment) === undefined
-            ? (_b = connection.commitment) !== null && _b !== void 0 ? _b : "confirmed"
+            ? ((_b = connection.commitment) !== null && _b !== void 0 ? _b : "confirmed")
             : options.blockhashCommitment;
         const simulationCommitment = (_c = options === null || options === void 0 ? void 0 : options.simulationCommtiment) !== null && _c !== void 0 ? _c : blockhashCommitment;
         const useMinContextSlot = (_d = options === null || options === void 0 ? void 0 : options.useMinContextSlot) !== null && _d !== void 0 ? _d : false;
@@ -10097,6 +10097,7 @@ function parseSplAccount(dataOrInfo) {
         return null;
     }
     const data = "executable" in dataOrInfo ? dataOrInfo.data : dataOrInfo;
+    // if (data.length === 82) return null; // token mint
     try {
         return AccountLayout.decode(data);
     }
@@ -10285,8 +10286,8 @@ function checkIfAssociatedWalletExists(connection, mintAccount, originalWallet)
     });
 }
 function getTransactionAccountsForSimulationDiff(connection, tx) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const result = new Set();
         if ("version" in tx) {
             const ALTs = tx.message.addressTableLookups.map((alt) => alt.accountKey);
@@ -10302,19 +10303,23 @@ function getTransactionAccountsForSimulationDiff(connection, tx) {
             const accGetter = tx.message.getAccountKeys({
                 addressLookupTableAccounts: parsedALTs,
             });
+            const staticWritableOrSignerAccounts = [];
+            for (let idx = 0; idx < accGetter.staticAccountKeys.length; idx += 1) {
+                if (tx.message.isAccountSigner(idx) || tx.message.isAccountWritable(idx))
+                    staticWritableOrSignerAccounts.push(accGetter.staticAccountKeys[idx]);
+            }
             for (const acc of [
-                ...accGetter.staticAccountKeys,
+                ...staticWritableOrSignerAccounts,
                 ...((_b = (_a = accGetter.accountKeysFromLookups) === null || _a === void 0 ? void 0 : _a.writable) !== null && _b !== void 0 ? _b : []),
             ]) {
                 result.add(acc.toBase58());
             }
         }
         else {
-            for (const ix of tx.instructions) {
-                // we don't need read-only accounts and instruction.programId since they won't change
-                ix.keys
-                    .filter((meta) => meta.isSigner || meta.isWritable)
-                    .map((meta) => result.add(meta.pubkey.toBase58()));
+            const compiled = tx.compileMessage();
+            for (let idx = 0; idx < compiled.accountKeys.length; idx += 1) {
+                if (compiled.isAccountSigner(idx) || compiled.isAccountWritable(idx))
+                    result.add(compiled.staticAccountKeys[idx].toBase58());
             }
         }
         return Array.from(result);
@@ -10376,6 +10381,11 @@ function getTransactionDiff(connection, tx, txAccounts) {
                 },
             }),
         ]);
+        if (simulatedTx.value.err !== null)
+            throw new Error(JSON.stringify({
+                err: simulatedTx.value.err,
+                logs: simulatedTx.value.logs,
+            }));
         const simulatesInfo = simulatedTx.value.accounts;
         const preBalances = parseMultipleAccounts(accountsInfo);
         const postBalances = parseMultipleAccounts(simulatesInfo);
@@ -10445,8 +10455,8 @@ var programs = /*#__PURE__*/Object.freeze({
 });
 
 function simulateTransaction(connection, tx, simulateConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const addressesToGetDiffFor = ((_b = (_a = simulateConfig.accounts) === null || _a === void 0 ? void 0 : _a.addresses) !== null && _b !== void 0 ? _b : []).map((a) => new PublicKey(a));
         const accountsToFetch = addressesToGetDiffFor.length > 0
             ? yield connection.getMultipleAccountsInfo(addressesToGetDiffFor)