@streamflow/common 6.0.0-alpha.9 → 6.0.1

package/dist/solana/utils.d.ts

@@ -24,12 +24,6 @@ export declare function isSignerWallet(walletOrKeypair: Keypair | SignerWalletAd
 export declare function isSignerKeypair(walletOrKeypair: Keypair | SignerWalletAdapter): walletOrKeypair is Keypair;
 /**
  * Creates a Transaction with given instructions and optionally signs it.
- * Be careful when passing `commitment` as for `confirmed` blockhash it always returns blockheight + 300 in `lastValidBlockHeight`
- * And if you use this blockheight to confirm the transaction it could happen so that transaction is successfully executed
- * But because `confirmTransaction` waits for only a minute it considers tx as expired as it could be that 300 blocks won't pass in a minute
- * https://solana.stackexchange.com/questions/6238/why-is-lastvalidblockheight-300-blocks-ahead-than-current-blockheight-if-hashes
- * https://solana.com/docs/core/transactions/retry
- * It might be better to rely on `commitment` level that you pass to `Connection` instance of Solana client as it will be used when fetching blockheight on transaction confirmation
  * @param connection - Solana client connection
  * @param ixs - Instructions to add to the Transaction
  * @param payer - PublicKey of payer
@@ -44,6 +38,10 @@ export declare function prepareTransaction(connection: Connection, ixs: Transact
 export declare function signTransaction(invoker: Keypair | SignerWalletAdapter, tx: Transaction): Promise<Transaction>;
 /**
  * Signs, sends and confirms Transaction
+ * Confirmation strategy is not 100% reliable here as in times of congestion there can be a case that tx is executed,
+ * but is not in `commitment` state and so it's not considered executed by the `sendAndConfirmRawTransaction` method,
+ * and it raises an expiry error even though transaction may be executed soon.
+ * So we add additional 50 blocks for checks to account for such issues.
  * @param connection - Solana client connection
  * @param invoker - Keypair used as signer
  * @param tx - Transaction instance
@@ -69,7 +67,7 @@ export declare function ataBatchExist(connection: Connection, paramsBatch: AtaPa
  * Generates a Transaction to create ATA for an array of owners
  * @param connection - Solana client connection
  * @param payer - Transaction invoker, should be a signer
- * @param coparamsBatchnfigs - Array of Params for an each ATA account: {mint, owner}
+ * @param paramsBatch - Array of Params for an each ATA account: {mint, owner}
  * @returns Unsigned Transaction with create ATA instructions
  */
 export declare function generateCreateAtaBatchTx(connection: Connection, payer: PublicKey, paramsBatch: AtaParams[]): Promise<{

package/dist/solana/utils.js

@@ -126,12 +126,6 @@ function isSignerKeypair(walletOrKeypair) {
 exports.isSignerKeypair = isSignerKeypair;
 /**
  * Creates a Transaction with given instructions and optionally signs it.
- * Be careful when passing `commitment` as for `confirmed` blockhash it always returns blockheight + 300 in `lastValidBlockHeight`
- * And if you use this blockheight to confirm the transaction it could happen so that transaction is successfully executed
- * But because `confirmTransaction` waits for only a minute it considers tx as expired as it could be that 300 blocks won't pass in a minute
- * https://solana.stackexchange.com/questions/6238/why-is-lastvalidblockheight-300-blocks-ahead-than-current-blockheight-if-hashes
- * https://solana.com/docs/core/transactions/retry
- * It might be better to rely on `commitment` level that you pass to `Connection` instance of Solana client as it will be used when fetching blockheight on transaction confirmation
  * @param connection - Solana client connection
  * @param ixs - Instructions to add to the Transaction
  * @param payer - PublicKey of payer
@@ -201,6 +195,10 @@ function signTransaction(invoker, tx) {
 exports.signTransaction = signTransaction;
 /**
  * Signs, sends and confirms Transaction
+ * Confirmation strategy is not 100% reliable here as in times of congestion there can be a case that tx is executed,
+ * but is not in `commitment` state and so it's not considered executed by the `sendAndConfirmRawTransaction` method,
+ * and it raises an expiry error even though transaction may be executed soon.
+ * So we add additional 50 blocks for checks to account for such issues.
  * @param connection - Solana client connection
  * @param invoker - Keypair used as signer
  * @param tx - Transaction instance
@@ -209,7 +207,7 @@ exports.signTransaction = signTransaction;
  */
 function signAndExecuteTransaction(connection, invoker, tx, hash) {
     return __awaiter(this, void 0, void 0, function () {
-        var signedTx, rawTx, confirmationStrategy, signature;
+        var signedTx, rawTx, confirmationStrategy;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, signTransaction(invoker, tx)];
@@ -219,14 +217,11 @@ function signAndExecuteTransaction(connection, invoker, tx, hash) {
                     if (!hash.lastValidBlockHeight || !signedTx.signature || !hash.blockhash)
                         throw Error("Error with transaction parameters.");
                     confirmationStrategy = {
-                        lastValidBlockHeight: hash.lastValidBlockHeight,
+                        lastValidBlockHeight: hash.lastValidBlockHeight + 50,
                         signature: bs58_1.default.encode(signedTx.signature),
                         blockhash: hash.blockhash,
                     };
-                    return [4 /*yield*/, (0, web3_js_1.sendAndConfirmRawTransaction)(connection, rawTx, confirmationStrategy)];
-                case 2:
-                    signature = _a.sent();
-                    return [2 /*return*/, signature];
+                    return [2 /*return*/, (0, web3_js_1.sendAndConfirmRawTransaction)(connection, rawTx, confirmationStrategy)];
             }
         });
     });
@@ -283,7 +278,7 @@ exports.ataBatchExist = ataBatchExist;
  * Generates a Transaction to create ATA for an array of owners
  * @param connection - Solana client connection
  * @param payer - Transaction invoker, should be a signer
- * @param coparamsBatchnfigs - Array of Params for an each ATA account: {mint, owner}
+ * @param paramsBatch - Array of Params for an each ATA account: {mint, owner}
  * @returns Unsigned Transaction with create ATA instructions
  */
 function generateCreateAtaBatchTx(connection, payer, paramsBatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/common",
-  "version": "6.0.0-alpha.9",
+  "version": "6.0.1",
   "description": "Common utilities and types used by streamflow packages.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/index.js",
@@ -23,9 +23,9 @@
     "lint-config": "eslint --print-config",
     "prepublishOnly": "npm run lint && npm run build"
   },
-  "gitHead": "ced180a9f3c99ae6b5dab7f2dca3309390e35e59",
+  "gitHead": "07782122a48131b4589edd9c536bb7f29dcbe0c9",
   "devDependencies": {
-    "@streamflow/eslint-config": "6.0.0-alpha.9",
+    "@streamflow/eslint-config": "6.0.0",
     "@types/bn.js": "5.1.1",
     "@types/jest": "29.2.4",
     "date-fns": "2.28.0",