rpc: Accept scientific notation for monetary amounts in JSON #6379

laanwj · 2015-07-06T08:54:12Z

Add a function ParseFixedPoint that parses numbers according to the JSON number specification and returns a 64-bit integer.

Then use this in AmountFromValue, rather than ParseMoney.

Also add lots of tests (thanks to @jonasschnelli for some of them).

Fixes issue #6297.

jonasschnelli · 2015-07-06T12:32:04Z

Tested ACK (reviewed code/tests, ran tests, successfully ran smartfees.py, some curl scientific notation tests).

jonasschnelli$ curl --user bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1 --data-binary '{"jsonrpc": "1.0", "id" : "1", "method": "sendtoaddress", "params": ["myWgdwSvL2z2WxUbc7wKnRnWnbR925YDaH", 1e-4] }' http://127.0.0.1:18332
{"result":"2ebf06579a36aa8a452924a071460de05d5d87ffc9266d35190ebc42e8476bf9","error":null,"id":"1"}

jonasschnelli$ ./src/bitcoin-cli --regtest gettransaction 2ebf06579a36aa8a452924a071460de05d5d87ffc9266d35190ebc42e8476bf9
{
  "amount": 0.00000000,
  "fee": -0.00000226,
  "confirmations": 0,
  "txid": "2ebf06579a36aa8a452924a071460de05d5d87ffc9266d35190ebc42e8476bf9",
  "walletconflicts": [
  ],
  "time": 1436184739,
  "timereceived": 1436184739,
  "details": [
    {
      "account": "",
      "address": "myWgdwSvL2z2WxUbc7wKnRnWnbR925YDaH",
      "category": "send",
      "amount": -0.00010000,
...

morcos · 2015-07-06T15:38:51Z

src/test/rpc_tests.cpp

+    BOOST_CHECK_EQUAL(AmountFromValue(ValueFromString("0.01e-6")), COIN/100000000);
+    BOOST_CHECK_EQUAL(AmountFromValue(ValueFromString("0.0000000000000000000000000000000000000000000000000000000000000000000000000001e+68")), COIN/100000000);
+    BOOST_CHECK_EQUAL(AmountFromValue(ValueFromString("10000000000000000000000000000000000000000000000000000000000000000e-64")), COIN);
+    BOOST_CHECK_EQUAL(AmountFromValue(ValueFromString("10000000000000000000000000000000000000000000000000000000000000000e-64")), COIN);


Isn't this a duplicate of the above line?

Yes, will remove (or if you have another test to suggest, please do :-).

maybe add some zeroes after the decimal point. you have an excessive number before and and excessive number after, try a test with an excessive number of zeroes both before and after....

jgarzik · 2015-07-06T16:27:16Z

ut ACK

morcos · 2015-07-06T17:35:41Z

ACK (code review and tested, but not exhaustively)

sipa · 2015-07-09T20:25:32Z

src/utilstrencodings.cpp

@@ -538,3 +538,118 @@ int atoi(const std::string& str)
 {
    return atoi(str.c_str());
 }
+
+/** Upper bound for mantissa.
+ * 10^18-1, largest arbitrary decimal that will fit in 64 bit.


Hypernit: this comment seems inaccurate. There are definitely larger integers that fit in 64 bit.

it's worded somewhat ackwardly: my point is that larger 64-bit signed integers cannot consist of arbitrary combinations of 0-9:

999999999999999999 1^18-1 9223372036854775807 (1<<63)-1 (max) 9999999999999999999 would not fit

Wouldn't be impossible to handle it, but I it would complicate bounds checking and don't see the point in our case.
I'll update the comment.

sipa · 2015-07-09T20:38:37Z

ACK. Carefully reviewed the code, but didn't test. The included test cases are convincing.

@jonasschnelli

Add a function `ParseFixedPoint` that parses numbers according to the JSON number specification and returns a 64-bit integer. Then this in `AmountFromValue`, rather than `ParseMoney`. Also add lots of tests (thanks to @jonasschnelli for some of them). Fixes issue bitcoin#6297.

9cc9152 rpc: Accept scientific notation for monetary amounts in JSON (Wladimir J. van der Laan)

Add UniValue as subtree Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6637 - bitcoin/bitcoin#6239 - bitcoin/bitcoin#6379 - bitcoin/bitcoin#6456 - bitcoin/bitcoin#6788

830eadf Solving rpc_fundrawtransaction.py amount rounding issue. (furszy) 6cf9778 ATMP: Do not try to get the inputs in zc tx. (furszy) 38efbb9 sync_blocks: Increase debugging to hunt down mempool_reorg intermittent failure (furszy) dd7855c sync_blocks: check that peer is connected when calling sync_*. (furszy) bc7d542 functional tests, sync_blocks only cleanup. (furszy) 1ae04e7 Fix mempool package tracking edge case (Suhas Daftuar) f4052aa Add test showing bug in mempool packages (furszy) 691749f rpc: Accept scientific notation for monetary amounts in JSON (furszy) b0f9051 Fix removeForReorg to use MedianTimePast (Suhas Daftuar) 92583c6 Don't call removeForReorg if DisconnectTip fails (Suhas Daftuar) bb77808 Track coinbase spends in CTxMemPoolEntry (furszy) f607f18 Change GetPriority calculation. (furszy) ac3c0f1 Remove default arguments for CTxMemPoolEntry() (furszy) 07eae9f Modify variable names for entry height and priority (furszy) 4356b31 Fix bug in mempool_tests unit test (Alex Morcos) f35ebe3 removeForReorg calls once-per-disconnect-> once-per-reorg (furszy) 7f5737f Fix comment in removeForReorg (furszy) 8ad82ca Fix removal of time-locked transactions during reorg (furszy) de74ab3 Move ProcessBlockFound reserveKey to optional. (furszy) Pull request description: More back ports and adaptations over the RPC values parsing and mempool. We need to get closer in this area :) . * bitcoin#6379 * bitcoin#6715 * bitcoin#6915 * bitcoin#7007 * bitcoin#7008 * bitcoin#12643 * bitcoin#18474 * bitcoin#18704 ACKs for top commit: Fuzzbawls: ACK 830eadf random-zebra: ACK 830eadf and merging... Tree-SHA512: 014b31008aaf09ebf838e21da59379a45565df440a77d66a0cd53e824a6d69673d6975d08243a43fb5a7ebd1a35c07d1d07412a87216b42e9d6f17a1c0bc5708

d1d15c8 Fix missing sigverion in main_test.cpp CreateDummyScriptSigWithKey. (furszy) a034daf Rename to PrecomputedTransactionData (furszy) b4b181b Unit test for sighash caching (furszy) 2ef3872 Report non-mandatory script failures correctly. (furszy) 446d340 Precompute sighashes (furszy) dfd24eb Update wallet_txn_close.py test: (furszy) a5170f0 BIP143: Signing logic. (furszy) d2dd547 BIP143: Verification logic. (furszy) dccc3c6 Refactor script validation to observe amounts (furszy) daf044a Reduce unnecessary hashing in signrawtransaction (furszy) Pull request description: Base work for the new transaction digest algorithm for signature verification on PIVX Sapling transactions. Essentially, an implementation of BIP143 + few more good commits that found down the rabbit hole. Back ports: * bitcoin#7276 * bitcoin#7976 * bitcoin#8118 * bitcoin#8149 (only amount validation and SignatureHash commits). * bitcoin#6088 (only the dummy signature one - will be removed once #1663 get merged -). * bitcoin#6379 * bitcoin#8524 Next step over this area (need 1553 merged to be able to push it) is the further specialization of BIP143 into our custom implementation of ZIP143 (with a different digest algorithm definition using our tx data and hash personalization). ACKs for top commit: Fuzzbawls: utACK d1d15c8 random-zebra: ACK d1d15c8 and merging... Tree-SHA512: 7665cccf095c5bce0b18ef7ab8fcf7bede9304993b48f1af9c352c568861dec728d1d68671aab857b73d46567678492c4b97c24644a15f3f29fc4d723b183522

laanwj added the RPC/REST/ZMQ label Jul 6, 2015

morcos reviewed Jul 6, 2015
View reviewed changes

laanwj force-pushed the 2015_07_fixedpoint_iterations branch from fa5c962 to 768516e Compare July 6, 2015 19:47

morcos mentioned this pull request Jul 7, 2015

rpc: Accept strings in AmountFromValue #6380

Merged

sipa reviewed Jul 9, 2015
View reviewed changes

laanwj force-pushed the 2015_07_fixedpoint_iterations branch from 768516e to 9cc9152 Compare July 10, 2015 13:45

laanwj merged commit 9cc9152 into bitcoin:master Jul 10, 2015

laanwj added a commit that referenced this pull request Jul 10, 2015

Merge pull request #6379

c52e8b3

9cc9152 rpc: Accept scientific notation for monetary amounts in JSON (Wladimir J. van der Laan)

laanwj mentioned this pull request Feb 9, 2016

RPC doesn't accept scientific notation for amounts #6297

Closed

str4d mentioned this pull request Feb 10, 2017

Add UniValue as subtree zcash/zcash#2082

Merged

dagurval mentioned this pull request Mar 18, 2017

rpc: Accept strings in AmountFromValue bitcoinxt/bitcoinxt#191

Merged

furszy mentioned this pull request Jun 6, 2020

Base work for the Sapling signatureHash PIVX-Project/PIVX#1666

Merged

furszy mentioned this pull request Jun 25, 2020

RPC & Mempool back ports. PIVX-Project/PIVX#1707

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rpc: Accept scientific notation for monetary amounts in JSON #6379

rpc: Accept scientific notation for monetary amounts in JSON #6379

laanwj commented Jul 6, 2015

jonasschnelli commented Jul 6, 2015

morcos Jul 6, 2015

laanwj Jul 6, 2015

morcos Jul 6, 2015

laanwj Jul 6, 2015

jgarzik commented Jul 6, 2015

morcos commented Jul 6, 2015

sipa Jul 9, 2015

laanwj Jul 10, 2015

sipa commented Jul 9, 2015

rpc: Accept scientific notation for monetary amounts in JSON #6379

rpc: Accept scientific notation for monetary amounts in JSON #6379

Conversation

laanwj commented Jul 6, 2015

jonasschnelli commented Jul 6, 2015

morcos Jul 6, 2015

Choose a reason for hiding this comment

laanwj Jul 6, 2015

Choose a reason for hiding this comment

morcos Jul 6, 2015

Choose a reason for hiding this comment

laanwj Jul 6, 2015

Choose a reason for hiding this comment

jgarzik commented Jul 6, 2015

morcos commented Jul 6, 2015

sipa Jul 9, 2015

Choose a reason for hiding this comment

laanwj Jul 10, 2015

Choose a reason for hiding this comment

sipa commented Jul 9, 2015