From 22d16c048bde69eb66d315990f2d407f7384cf4f Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Fri, 17 Apr 2015 18:41:27 +0200 Subject: [PATCH 1/2] 0x -> 0x0 for numbers --- TestHelper.cpp | 8 ++++---- blockchain.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TestHelper.cpp b/TestHelper.cpp index 92a8258ac..49c6bb023 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -123,7 +123,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) { static const set hashes {"bloom" , "coinbase", "hash", "mixHash", "parentHash", "receiptTrie", "stateRoot", "transactionsTrie", "uncleHash", "currentCoinbase", - "previousHash", "to", "address", "caller", "origin", "secretKey"}; + "previousHash", "to", "address", "caller", "origin", "secretKey", "data"}; for (auto& i: _o) { @@ -140,7 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) str = value.get_str(); else continue; - _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); + _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + (toHex(toCompactBigEndian(toInt(str))).empty() ? "0" : toHex(toCompactBigEndian(toInt(str)))); } return _o; } @@ -363,8 +363,8 @@ json_spirit::mObject fillJsonWithState(State _state) for (auto const& a: _state.addresses()) { json_spirit::mObject o; - o["balance"] = "0x" + toHex(toCompactBigEndian(_state.balance(a.first))); - o["nonce"] = "0x" + toHex(toCompactBigEndian(_state.transactionsFrom(a.first))); + o["balance"] = "0x" + (toHex(toCompactBigEndian(_state.balance(a.first))).empty() ? "0" : toHex(toCompactBigEndian(_state.balance(a.first)))); + o["nonce"] = "0x" + (toHex(toCompactBigEndian(_state.transactionsFrom(a.first))).empty() ? "0" : toHex(toCompactBigEndian(_state.transactionsFrom(a.first)))); { json_spirit::mObject store; for (auto const& s: _state.storage(a.first)) diff --git a/blockchain.cpp b/blockchain.cpp index b144abe62..502182074 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -625,11 +625,11 @@ void writeBlockHeaderToJson(mObject& _o, BlockInfo const& _bi) _o["transactionsTrie"] = toString(_bi.transactionsRoot); _o["receiptTrie"] = toString(_bi.receiptsRoot); _o["bloom"] = toString(_bi.logBloom); - _o["difficulty"] = "0x" + toHex(toCompactBigEndian(_bi.difficulty)); - _o["number"] = "0x" + toHex(toCompactBigEndian(_bi.number)); - _o["gasLimit"] = "0x" + toHex(toCompactBigEndian(_bi.gasLimit)); - _o["gasUsed"] = "0x" + toHex(toCompactBigEndian(_bi.gasUsed)); - _o["timestamp"] = "0x" + toHex(toCompactBigEndian(_bi.timestamp)); + _o["difficulty"] = "0x" + (toHex(toCompactBigEndian(_bi.difficulty)).empty() ? "0" : toHex(toCompactBigEndian(_bi.difficulty))); + _o["number"] = "0x" + (toHex(toCompactBigEndian(_bi.number)).empty() ? "0" : toHex(toCompactBigEndian(_bi.number))); + _o["gasLimit"] = "0x" + (toHex(toCompactBigEndian(_bi.gasLimit)).empty() ? "0" : toHex(toCompactBigEndian(_bi.gasLimit))); + _o["gasUsed"] = "0x" + (toHex(toCompactBigEndian(_bi.gasUsed)).empty() ? "0" : toHex(toCompactBigEndian(_bi.gasUsed))); + _o["timestamp"] = "0x" + (toHex(toCompactBigEndian(_bi.timestamp)).empty() ? "0" : toHex(toCompactBigEndian(_bi.timestamp))); _o["extraData"] ="0x" + toHex(_bi.extraData); _o["mixHash"] = toString(_bi.mixHash); _o["nonce"] = toString(_bi.nonce); From d399f077eff87a2589188fe6353a42c7dd60597a Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Fri, 17 Apr 2015 22:44:26 +0200 Subject: [PATCH 2/2] simplification --- TestHelper.cpp | 6 +++--- blockchain.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TestHelper.cpp b/TestHelper.cpp index 49c6bb023..ed844e961 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -140,7 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) str = value.get_str(); else continue; - _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + (toHex(toCompactBigEndian(toInt(str))).empty() ? "0" : toHex(toCompactBigEndian(toInt(str)))); + _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str), 1)); } return _o; } @@ -363,8 +363,8 @@ json_spirit::mObject fillJsonWithState(State _state) for (auto const& a: _state.addresses()) { json_spirit::mObject o; - o["balance"] = "0x" + (toHex(toCompactBigEndian(_state.balance(a.first))).empty() ? "0" : toHex(toCompactBigEndian(_state.balance(a.first)))); - o["nonce"] = "0x" + (toHex(toCompactBigEndian(_state.transactionsFrom(a.first))).empty() ? "0" : toHex(toCompactBigEndian(_state.transactionsFrom(a.first)))); + o["balance"] = "0x" + toHex(toCompactBigEndian(_state.balance(a.first), 1)); + o["nonce"] = "0x" + toHex(toCompactBigEndian(_state.transactionsFrom(a.first), 1)); { json_spirit::mObject store; for (auto const& s: _state.storage(a.first)) diff --git a/blockchain.cpp b/blockchain.cpp index 502182074..ec8fb7539 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -625,11 +625,11 @@ void writeBlockHeaderToJson(mObject& _o, BlockInfo const& _bi) _o["transactionsTrie"] = toString(_bi.transactionsRoot); _o["receiptTrie"] = toString(_bi.receiptsRoot); _o["bloom"] = toString(_bi.logBloom); - _o["difficulty"] = "0x" + (toHex(toCompactBigEndian(_bi.difficulty)).empty() ? "0" : toHex(toCompactBigEndian(_bi.difficulty))); - _o["number"] = "0x" + (toHex(toCompactBigEndian(_bi.number)).empty() ? "0" : toHex(toCompactBigEndian(_bi.number))); - _o["gasLimit"] = "0x" + (toHex(toCompactBigEndian(_bi.gasLimit)).empty() ? "0" : toHex(toCompactBigEndian(_bi.gasLimit))); - _o["gasUsed"] = "0x" + (toHex(toCompactBigEndian(_bi.gasUsed)).empty() ? "0" : toHex(toCompactBigEndian(_bi.gasUsed))); - _o["timestamp"] = "0x" + (toHex(toCompactBigEndian(_bi.timestamp)).empty() ? "0" : toHex(toCompactBigEndian(_bi.timestamp))); + _o["difficulty"] = "0x" + toHex(toCompactBigEndian(_bi.difficulty), 1); + _o["number"] = "0x" + toHex(toCompactBigEndian(_bi.number), 1); + _o["gasLimit"] = "0x" + toHex(toCompactBigEndian(_bi.gasLimit), 1); + _o["gasUsed"] = "0x" + toHex(toCompactBigEndian(_bi.gasUsed), 1); + _o["timestamp"] = "0x" + toHex(toCompactBigEndian(_bi.timestamp), 1); _o["extraData"] ="0x" + toHex(_bi.extraData); _o["mixHash"] = toString(_bi.mixHash); _o["nonce"] = toString(_bi.nonce);