diff options
| author | winsvega <winsvega@mail.ru> | 2015-01-24 01:33:34 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-01-24 01:33:34 +0800 |
| commit | f22f8ba2ef2c25fac39657baef21d619e1686864 (patch) | |
| tree | bca6cd3e79081c8a8bffc724a95420a808ccc4a6 /transaction.cpp | |
| parent | f8da9c121f11172af6b2abfac4ff9705f0d748ec (diff) | |
| download | dexon-solidity-f22f8ba2ef2c25fac39657baef21d619e1686864.tar.gz dexon-solidity-f22f8ba2ef2c25fac39657baef21d619e1686864.tar.zst dexon-solidity-f22f8ba2ef2c25fac39657baef21d619e1686864.zip | |
minor changes
Diffstat (limited to 'transaction.cpp')
| -rw-r--r-- | transaction.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/transaction.cpp b/transaction.cpp index 9fe91c6e..70c4454f 100644 --- a/transaction.cpp +++ b/transaction.cpp @@ -52,9 +52,7 @@ Transaction createTransactionFromFields(mObject& _tObj) else rlpStream << Address(_tObj["to"].get_str()); rlpStream << bigint(_tObj["value"].get_str()) << importData(_tObj); - u256 r = h256(fromHex(_tObj["r"].get_str())); - u256 s = h256(fromHex(_tObj["s"].get_str())); - rlpStream << bigint(_tObj["v"].get_str()) << r << s; + rlpStream << bigint(_tObj["v"].get_str()) << bigint(_tObj["r"].get_str()) << bigint(_tObj["s"].get_str()); return Transaction(rlpStream.out(), CheckSignature::Sender); } @@ -132,7 +130,6 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) if (tObj.count("value") > 0) rlpStream << bigint(tObj["value"].get_str()); - if (tObj.count("data") > 0) rlpStream << importData(tObj); @@ -140,16 +137,10 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) rlpStream << bigint(tObj["v"].get_str()); if (tObj.count("r") > 0) - { - u256 r = h256(fromHex(tObj["r"].get_str())); - rlpStream << r; - } + rlpStream << bigint(tObj["r"].get_str()); if (tObj.count("s") > 0) - { - u256 s = h256(fromHex(tObj["s"].get_str())); - rlpStream << s; - } + rlpStream << bigint(tObj["s"].get_str()); if (tObj.count("extrafield") > 0) rlpStream << bigint(tObj["extrafield"].get_str()); |