Allow explicitly specifying the transaction height

i.e. `/tx/<txid>?height=<height>`. This can work without txindex. When txindex is disabled, the block page links to the transactions with this parameter set.
janoside · Feb 4, 2021 · c062919 · c062919
1 parent 4aafc4e
commit c062919
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/app/api/coreApi.js b/app/api/coreApi.js
@@ -548,6 +548,12 @@ function getBlockByHeight(blockHeight) {
 	});
 }
 
+function getBlockHashByHeight(blockHeight) {
+	return tryCacheThenRpcApi(blockCache, "getBlockHashByHeight-" + blockHeight, ONE_HR, function() {
+		return rpcApi.getBlockHashByHeight(blockHeight);
+	});
+}
+
 function getBlocksByHeight(blockHeights) {
 	return new Promise(function(resolve, reject) {
 		var promises = [];
@@ -1069,6 +1075,7 @@ module.exports = {
 	getMiningInfo: getMiningInfo,
 	getIndexInfo: getIndexInfo,
 	getBlockByHeight: getBlockByHeight,
+	getBlockHashByHeight: getBlockHashByHeight,
 	getBlocksByHeight: getBlocksByHeight,
 	getBlockByHash: getBlockByHash,
 	getBlocksByHash: getBlocksByHash,

diff --git a/app/api/rpcApi.js b/app/api/rpcApi.js
@@ -193,6 +193,10 @@ function getBlockHeaderByHeight(blockHeight) {
 	});
 }
 
+function getBlockHashByHeight(blockHeight) {
+	return getRpcDataWithParams({method:"getblockhash", parameters:[blockHeight]});
+}
+
 function getBlockByHash(blockHash) {
 	debugLog("getBlockByHash: %s", blockHash);
 
@@ -516,6 +520,7 @@ module.exports = {
 	getBlockStatsByHeight: getBlockStatsByHeight,
 	getBlockHeaderByHash: getBlockHeaderByHash,
 	getBlockHeaderByHeight: getBlockHeaderByHeight,
+	getBlockHashByHeight: getBlockHashByHeight,
 	getTxOut: getTxOut,
 
 	minRpcVersions: minRpcVersions

diff --git a/routes/baseRouter.js b/routes/baseRouter.js
@@ -828,11 +828,16 @@ router.get("/tx/:transactionId", function(req, res, next) {
 
 	res.locals.result = {};
 
-	coreApi.getRawTransactionsWithInputs([txid]).then(function(rawTxResult) {
+	var txPromise = req.query.height
+		? coreApi.getBlockHashByHeight(parseInt(req.query.height))
+				.then(blockhash => coreApi.getRawTransactionsWithInputs([txid], -1, blockhash))
+		: coreApi.getRawTransactionsWithInputs([txid], -1);
+
+	txPromise.then(function(rawTxResult) {
 		var tx = rawTxResult.transactions[0];
 
 		res.locals.result.getrawtransaction = tx;
-		res.locals.result.txInputs = rawTxResult.txInputsByTransaction[txid];
+		res.locals.result.txInputs = rawTxResult.txInputsByTransaction[txid] || {};
 
 		var promises = [];
 

diff --git a/views/includes/block-content.pug b/views/includes/block-content.pug
@@ -386,6 +386,7 @@ div.tab-content
 				- var fontawesomeOutputName = "sign-out-alt";
 
 				div
+					- query_height = global.getindexinfo && !global.getindexinfo.txindex ? `?height=${result.getblock.height}` : ''
 					each tx, txIndex in result.transactions
 						//pre
 						//	code.json.bg-light #{JSON.stringify(tx, null, 4)}
@@ -394,7 +395,7 @@ div.tab-content
 								if (tx && tx.txid)
 									span(title=`Index in Block: #${(txIndex + offset).toLocaleString()}`, data-toggle="tooltip") ##{(txIndex + offset).toLocaleString()}
 									span  &ndash; 
-									a(href=("./tx/" + tx.txid)) #{tx.txid}
+									a(href=("./tx/" + tx.txid + query_height)) #{tx.txid}
 
 									if (global.specialTransactions && global.specialTransactions[tx.txid])
 										span