fix for tx confirmations when cache enabled

janoside · Apr 22, 2021 · ac9ad18 · ac9ad18
1 parent 789f643
commit ac9ad18
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/app/api/rpcApi.js b/app/api/rpcApi.js
@@ -50,6 +50,10 @@ function getBlockchainInfo() {
 
 }
 
+function getBlockCount() {
+	return getRpcData("getblockcount");
+}
+
 function getNetworkInfo() {
 	return getRpcData("getnetworkinfo");
 }
@@ -572,6 +576,7 @@ module.exports = {
 	getRpcDataWithParams: getRpcDataWithParams,
 
 	getBlockchainInfo: getBlockchainInfo,
+	getBlockCount: getBlockCount,
 	getNetworkInfo: getNetworkInfo,
 	getNetTotals: getNetTotals,
 	getMempoolInfo: getMempoolInfo,

diff --git a/routes/baseRouter.js b/routes/baseRouter.js
@@ -1002,13 +1002,22 @@ router.get("/tx/:transactionId", asyncHandler(async (req, res, next) => {
 					if (err3) return reject(err3);
 					res.locals.result.getblock = result3;
 
-					resolve();
+					resolve(result3);
 				});
-			}));
+			}).then(function(blockheader) {
+				// fix confirmations for cached transactions
+				if (!config.noInmemoryRpcCache) {
+					rpcApi.getBlockCount().then(function(blockcount){
+						var confs = blockcount - blockheader.height + 1;
+						res.locals.tx.confirmations = confs;
+						res.locals.result.getrawtransaction.confirmations = confs;
+					});
+				}
+			}))
 		}
 
 		await Promise.all(promises);
-		
+
 		res.render("transaction");
 
 		next();