@huma-finance/sdk 0.0.62-beta.729 → 0.0.62-beta.731

package/dist/cjs/utils/index.d.ts

@@ -3,3 +3,4 @@ export * from './web3';
 export * from './poolInfo';
 export * from './maticGasStation';
 export * from './solana/getReceivableReferenceAccount';
+export * from './solana/buildOptimalTransaction';

package/dist/cjs/utils/index.js

@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./web3"), exports);
 tslib_1.__exportStar(require("./poolInfo"), exports);
 tslib_1.__exportStar(require("./maticGasStation"), exports);
 tslib_1.__exportStar(require("./solana/getReceivableReferenceAccount"), exports);
+tslib_1.__exportStar(require("./solana/buildOptimalTransaction"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,kDAAuB;AACvB,iDAAsB;AACtB,qDAA0B;AAC1B,4DAAiC;AACjC,iFAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,kDAAuB;AACvB,iDAAsB;AACtB,qDAA0B;AAC1B,4DAAiC;AACjC,iFAAsD;AACtD,2EAAgD"}

package/dist/cjs/utils/solana/buildOptimalTransaction.d.ts

@@ -1,3 +1,5 @@
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { Connection, PublicKey, Transaction } from '@solana/web3.js';
 import { HumaSolanaContext } from '../../helpers';
+export declare function extractWritableAccounts(tx: Transaction): PublicKey[];
 export declare function buildOptimalTransaction(tx: Transaction, txAccounts: PublicKey[], context: HumaSolanaContext): Promise<Transaction>;
+export declare function buildOptimalTransactionFromConnection(tx: Transaction, txAccounts: PublicKey[], connection: Connection): Promise<Transaction>;

package/dist/cjs/utils/solana/buildOptimalTransaction.js

@@ -1,20 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractWritableAccounts = extractWritableAccounts;
 exports.buildOptimalTransaction = buildOptimalTransaction;
+exports.buildOptimalTransactionFromConnection = buildOptimalTransactionFromConnection;
 const web3_js_1 = require("@solana/web3.js");
-async function buildOptimalTransaction(tx, txAccounts, context) {
+function extractWritableAccounts(tx) {
+    const writableAccounts = new Set();
+    tx.instructions.forEach((ix) => {
+        ix.keys.forEach((key) => {
+            if (key.isWritable) {
+                writableAccounts.add(key.pubkey);
+            }
+        });
+    });
+    return Array.from(writableAccounts);
+}
+async function buildOptimalTransactionImpl(tx, txAccounts, connection) {
     const [recentPrioritizationFees, recentBlockhash] = await Promise.all([
-        context.connection.getRecentPrioritizationFees({
+        connection.getRecentPrioritizationFees({
             lockedWritableAccounts: txAccounts,
         }),
-        context.connection.getLatestBlockhash('confirmed'),
+        connection.getLatestBlockhash('confirmed'),
     ]);
     let averagePrioritizationFee = recentPrioritizationFees.reduce((acc, fee) => acc + fee.prioritizationFee, 0);
-    averagePrioritizationFee = Math.ceil(averagePrioritizationFee / recentPrioritizationFees.length);
+    averagePrioritizationFee = Math.ceil((averagePrioritizationFee / recentPrioritizationFees.length) * 1.5);
     tx.instructions.unshift(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
         microLamports: averagePrioritizationFee,
     }));
     tx.recentBlockhash = recentBlockhash.blockhash;
+    tx.lastValidBlockHeight = recentBlockhash.lastValidBlockHeight;
     return tx;
 }
+async function buildOptimalTransaction(tx, txAccounts, context) {
+    return buildOptimalTransactionImpl(tx, txAccounts, context.connection);
+}
+async function buildOptimalTransactionFromConnection(tx, txAccounts, connection) {
+    return buildOptimalTransactionImpl(tx, txAccounts, connection);
+}
 //# sourceMappingURL=buildOptimalTransaction.js.map

package/dist/cjs/utils/solana/buildOptimalTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildOptimalTransaction.js","sourceRoot":"","sources":["../../../../src/utils/solana/buildOptimalTransaction.ts"],"names":[],"mappings":";;AAQA,0DA4BC;AApCD,6CAKwB;AAGjB,KAAK,UAAU,uBAAuB,CAC3C,EAAe,EACf,UAAuB,EACvB,OAA0B;IAE1B,MAAM,CAAC,wBAAwB,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpE,OAAO,CAAC,UAAU,CAAC,2BAA2B,CAAC;YAC7C,sBAAsB,EAAE,UAAU;SACnC,CAAC;QACF,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC;KACnD,CAAC,CAAA;IAEF,IAAI,wBAAwB,GAAG,wBAAwB,CAAC,MAAM,CAC5D,CAAC,GAAW,EAAE,GAA6B,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAC3E,CAAC,CACF,CAAA;IACD,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAClC,wBAAwB,GAAG,wBAAwB,CAAC,MAAM,CAC3D,CAAA;IAED,EAAE,CAAC,YAAY,CAAC,OAAO,CACrB,8BAAoB,CAAC,mBAAmB,CAAC;QACvC,aAAa,EAAE,wBAAwB;KACxC,CAAC,CACH,CAAA;IAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC,SAAS,CAAA;IAC9C,OAAO,EAAE,CAAA;AACX,CAAC"}
+{"version":3,"file":"buildOptimalTransaction.js","sourceRoot":"","sources":["../../../../src/utils/solana/buildOptimalTransaction.ts"],"names":[],"mappings":";;AASA,0DAYC;AAiCD,0DAMC;AAED,sFAMC;AApED,6CAMwB;AAGxB,SAAgB,uBAAuB,CAAC,EAAe;IACrD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAa,CAAA;IAE7C,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QAC7B,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACnB,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAClC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;AACrC,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,EAAe,EACf,UAAuB,EACvB,UAAsB;IAEtB,MAAM,CAAC,wBAAwB,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpE,UAAU,CAAC,2BAA2B,CAAC;YACrC,sBAAsB,EAAE,UAAU;SACnC,CAAC;QACF,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC;KAC3C,CAAC,CAAA;IAEF,IAAI,wBAAwB,GAAG,wBAAwB,CAAC,MAAM,CAC5D,CAAC,GAAW,EAAE,GAA6B,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAC3E,CAAC,CACF,CAAA;IACD,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAClC,CAAC,wBAAwB,GAAG,wBAAwB,CAAC,MAAM,CAAC,GAAG,GAAG,CACnE,CAAA;IAED,EAAE,CAAC,YAAY,CAAC,OAAO,CACrB,8BAAoB,CAAC,mBAAmB,CAAC;QACvC,aAAa,EAAE,wBAAwB;KACxC,CAAC,CACH,CAAA;IAED,EAAE,CAAC,eAAe,GAAG,eAAe,CAAC,SAAS,CAAA;IAC9C,EAAE,CAAC,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAA;IAC9D,OAAO,EAAE,CAAA;AACX,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,EAAe,EACf,UAAuB,EACvB,OAA0B;IAE1B,OAAO,2BAA2B,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;AACxE,CAAC;AAEM,KAAK,UAAU,qCAAqC,CACzD,EAAe,EACf,UAAuB,EACvB,UAAsB;IAEtB,OAAO,2BAA2B,CAAC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAChE,CAAC"}