kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

rpc: Use ValueFromAmount instead of FormatMoney in TxToUniv 

With this, the amounts returned in `decoderawtransaction` will be
padded to 8 digits like anywhwere else in the API.
0.15
Wladimir J. van der Laan 7 years ago
parent
46347add43
commit
ec05c508c6
22 changed files with 25 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/core_write.cpp
  2. 2
      test/util/data/tt-delin1-out.json
  3. 2
      test/util/data/tt-delout1-out.json
  4. 2
      test/util/data/tt-locktime317000-out.json
  5. 4
      test/util/data/txcreate1.json
  6. 2
      test/util/data/txcreate2.json
  7. 4
      test/util/data/txcreatedata1.json
  8. 4
      test/util/data/txcreatedata2.json
  9. 2
      test/util/data/txcreatedata_seq0.json
  10. 2
      test/util/data/txcreatedata_seq1.json
  11. 2
      test/util/data/txcreatemultisig1.json
  12. 2
      test/util/data/txcreatemultisig2.json
  13. 2
      test/util/data/txcreatemultisig3.json
  14. 2
      test/util/data/txcreatemultisig4.json
  15. 2
      test/util/data/txcreateoutpubkey1.json
  16. 2
      test/util/data/txcreateoutpubkey2.json
  17. 2
      test/util/data/txcreateoutpubkey3.json
  18. 2
      test/util/data/txcreatescript1.json
  19. 2
      test/util/data/txcreatescript2.json
  20. 2
      test/util/data/txcreatescript3.json
  21. 2
      test/util/data/txcreatescript4.json
  22. 2
      test/util/data/txcreatesignv1.json

3
src/core_write.cpp
Unescape View File

@ -194,8 +194,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
UniValue out(UniValue::VOBJ); UniValue out(UniValue::VOBJ);
UniValue outValue(UniValue::VNUM, FormatMoney(txout.nValue)); out.pushKV("value", ValueFromAmount(txout.nValue));
out.pushKV("value", outValue);
out.pushKV("n", (int64_t)i); out.pushKV("n", (int64_t)i);
UniValue o(UniValue::VOBJ); UniValue o(UniValue::VOBJ);

2
test/util/data/tt-delin1-out.json
Unescape View File

@ -189,7 +189,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.3782, "value": 1.37820000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",

2
test/util/data/tt-delout1-out.json
Unescape View File

@ -198,7 +198,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.3782, "value": 1.37820000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",

2
test/util/data/tt-locktime317000-out.json
Unescape View File

@ -198,7 +198,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.3782, "value": 1.37820000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 8fd139bb39ced713f231c58a4d07bf6954d1c201 OP_EQUALVERIFY OP_CHECKSIG",

4
test/util/data/txcreate1.json
Unescape View File

@ -36,7 +36,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.18, "value": 0.18000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
@ -49,7 +49,7 @@
} }
}, },
{ {
"value": 4.00, "value": 4.00000000,
"n": 1, "n": 1,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 f2d4db28cad6502226ee484ae24505c2885cb12d OP_EQUALVERIFY OP_CHECKSIG",

2
test/util/data/txcreate2.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "", "asm": "",

4
test/util/data/txcreatedata1.json
Unescape View File

@ -18,7 +18,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.18, "value": 0.18000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
@ -31,7 +31,7 @@
} }
}, },
{ {
"value": 4.00, "value": 4.00000000,
"n": 1, "n": 1,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e", "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",

4
test/util/data/txcreatedata2.json
Unescape View File

@ -18,7 +18,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.18, "value": 0.18000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",
@ -31,7 +31,7 @@
} }
}, },
{ {
"value": 0.00, "value": 0.00000000,
"n": 1, "n": 1,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e", "asm": "OP_RETURN 54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e",

2
test/util/data/txcreatedata_seq0.json
Unescape View File

@ -18,7 +18,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.18, "value": 0.18000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",

2
test/util/data/txcreatedata_seq1.json
Unescape View File

@ -27,7 +27,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.18, "value": 0.18000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 1fc11f39be1729bf973a7ab6a615ca4729d64574 OP_EQUALVERIFY OP_CHECKSIG",

2
test/util/data/txcreatemultisig1.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.00, "value": 1.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG", "asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",

2
test/util/data/txcreatemultisig2.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.00, "value": 1.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL", "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL",

2
test/util/data/txcreatemultisig3.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.00, "value": 1.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05", "asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05",

2
test/util/data/txcreatemultisig4.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 1.00, "value": 1.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL", "asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL",

2
test/util/data/txcreateoutpubkey1.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG", "asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG",

2
test/util/data/txcreateoutpubkey2.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "0 a2516e770582864a6a56ed21a102044e388c62e3", "asm": "0 a2516e770582864a6a56ed21a102044e388c62e3",

2
test/util/data/txcreateoutpubkey3.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL", "asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL",

2
test/util/data/txcreatescript1.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DROP", "asm": "OP_DROP",

2
test/util/data/txcreatescript2.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL", "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL",

2
test/util/data/txcreatescript3.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6", "asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6",

2
test/util/data/txcreatescript4.json
Unescape View File

@ -9,7 +9,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.00, "value": 0.00000000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL", "asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL",

2
test/util/data/txcreatesignv1.json
Unescape View File

@ -18,7 +18,7 @@
], ],
"vout": [ "vout": [
{ {
"value": 0.001, "value": 0.00100000,
"n": 0, "n": 0,
"scriptPubKey": { "scriptPubKey": {
"asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG", "asm": "OP_DUP OP_HASH160 5834479edbbe0539b31ffd3a8f8ebadc2165ed01 OP_EQUALVERIFY OP_CHECKSIG",

Write Preview
Loading…
Cancel
Save