RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #434 from hyzhak/feature/block-height-in-transaction

Browse Source 
add block height to transaction response
This commit is contained in:
Matias Alejo Garcia 2016-01-07 14:20:14 -03:00
commit 44014b5bcb
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/transactions.js
View File

@ -92,6 +92,7 @@ TxController.prototype.transformTransaction = function(transaction, callback) {
transformed.vout = vout;
transformed.blockhash = transaction.__blockHash;
transformed.blockheight = transaction.__height;
transformed.confirmations = confirmations;
var time = transaction.__timestamp ? transaction.__timestamp : Math.round(Date.now() / 1000);
transformed.time = time;

1
test/addresses.js
View File

@ -455,6 +455,7 @@ describe('Addresses', function() {
}
],
"blockhash": "0000000000000041ddc94ecf4f86a456a83b2e320c36c6f0c13ff92c7e75f013",
"blockheight": 534181,
"confirmations": 52,
"time": 1441116143,
"blocktime": 1441116143,

7
test/transactions.js
View File

@ -80,6 +80,7 @@ describe('Transactions', function() {
}
],
"blockhash": "0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7",
"blockheight": 533974,
"confirmations": 230,
"time": 1440987503,
"blocktime": 1440987503,
@ -213,6 +214,7 @@ describe('Transactions', function() {
var blockHex = '07000020a491892cca9f143f7f00b8d65bbce0204bb32e17e914325fa5010000000000003e28f0519ecf01f7f01ea8da61084b2e4741a18ce1f3738117b84458353764b06fb9e35567f20c1a78eb626f0301000000010000000000000000000000000000000000000000000000000000000000000000ffffffff2303d6250800feb0aae355fe263600000963676d696e6572343208ae5800000000000000ffffffff01c018824a000000001976a91468bedce8982d25c3b6b03f6238cbad00378b8ead88ac000000000100000002ad5a14ae9d0f3221b790c4fc590fddceea1456e5692d8c4bf1ff7175f2b0c987000000008b4830450221008e5df62719cd92d7b137d00bbd27f153f2909bcad3a300960bc1020ec6d5e961022039df51600ff4fb5da5a794d1648c6b47c1f7d277fd5877fb5e52a730a3595f8c014104eb1e0ccd9afcac42229348dd776e991c69551ae3474340fada12e787e51758397e1d3afdba360d6374261125ea3b6ea079a5f202c150dfd729e1062d9176a307ffffffff9621ac65bc22ea593ca9a61a8d63e461bf3d3f277989df5d3bd33ddfae0aa1d8000000008a4730440220761464d7bab9515d92260762a97af82a9b25d202d8f7197b1aaec81b6fed541f022059f99606de6b06e17b2cd102dceb3807ebdd9e777a5b77c9a0b3672f5eabcb31014104eb1e0ccd9afcac42229348dd776e991c69551ae3474340fada12e787e51758397e1d3afdba360d6374261125ea3b6ea079a5f202c150dfd729e1062d9176a307ffffffff02dc374401000000001976a9144b7b335f978f130269fe661423258ae9642df8a188ac72b3d000000000001976a9146efcf883b4b6f9997be9a0600f6c095fe2bd2d9288ac000000000100000002060d3cb6dfb7ffe85e2908010fea63190c9707e96fc7448128eb895b5e222771030000006b483045022100f67cffc0ae23adb236ff3edb4a9736e277605db30cc7708dfab8cf1e1483bbce022052396aa5d664ec1cb65992c423fd9a17e94dc7af328d2d559e90746dd195ca5901210346134da14907581d8190d3980caaf46d95e4eb9c1ca8e70f1fc6007fefb1909dfeffffff7b2d8a8263cffbdb722e2a5c74166e6f2258634e277c0b08f51b578b667e2fba000000006a473044022077222a91cda23af69179377c62d84a176fb12caff6c5cbf6ae9e5957ff3b1afe0220768edead76819228dcba18cca3c9a5a5d4c32919720f21df21a297ba375bbe5c012103371ea5a4dfe356b3ea4042a537d7ab7ee0faabd43e21b6cc076fda2240629eeefeffffff02209a1d00000000001976a9148e451eec7ca0a1764b4ab119274efdd2727b3c8588ac40420f00000000001976a914d0fce8f064cd1059a6a11501dd66fe42368572b088accb250800';
var blockIndex = {
"hash": "0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7",
"blockheight": 533974,
"chainWork": "0000000000000000000000000000000000000000000000054626b1839ade284a",
"prevHash": "00000000000001a55f3214e9172eb34b20e0bc5bd6b8007f3f149fca2c8991a4",
"height": 533974
@ -295,6 +297,7 @@ describe('Transactions', function() {
}
],
"blockhash": "0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7",
"blockheight": 533974,
"confirmations": 236,
"time": 1440987503,
"blocktime": 1440987503,
@ -368,6 +371,7 @@ describe('Transactions', function() {
}
],
"blockhash": "0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7",
"blockheight": 533974,
"confirmations": 236,
"time": 1440987503,
"blocktime": 1440987503,
@ -445,6 +449,7 @@ describe('Transactions', function() {
}
],
"blockhash": "0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7",
"blockheight": 533974,
"confirmations": 236,
"time": 1440987503,
"blocktime": 1440987503,
@ -700,6 +705,7 @@ describe('Transactions', function() {
}
],
"blockhash": "00000000000001001aba15de213648f370607fb048288dd27b96f7e833a73520",
"blockheight": 534105,
"confirmations": 119,
"time": 1441068774,
"blocktime": 1441068774,
@ -763,6 +769,7 @@ describe('Transactions', function() {
}
],
"blockhash": "0000000000000a3acc1f7fe72917eb48bb319ed96c125a6dfcc0ba6acab3c4d0",
"blockheight": 534110,
"confirmations": 114,
"time": 1441072817,
"blocktime": 1441072817,