cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
winsvega 2015-01-23 20:33:34 +03:00
parent f8da9c121f
commit f22f8ba2ef
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
transaction.cpp
View File

@ -52,9 +52,7 @@ Transaction createTransactionFromFields(mObject& _tObj)
else else
rlpStream << Address(_tObj["to"].get_str()); rlpStream << Address(_tObj["to"].get_str());
rlpStream << bigint(_tObj["value"].get_str()) << importData(_tObj); rlpStream << bigint(_tObj["value"].get_str()) << importData(_tObj);
u256 r = h256(fromHex(_tObj["r"].get_str())); rlpStream << bigint(_tObj["v"].get_str()) << bigint(_tObj["r"].get_str()) << bigint(_tObj["s"].get_str());
u256 s = h256(fromHex(_tObj["s"].get_str()));
rlpStream << bigint(_tObj["v"].get_str()) << r << s;
return Transaction(rlpStream.out(), CheckSignature::Sender); return Transaction(rlpStream.out(), CheckSignature::Sender);
} }
@ -132,7 +130,6 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin)
if (tObj.count("value") > 0) if (tObj.count("value") > 0)
rlpStream << bigint(tObj["value"].get_str()); rlpStream << bigint(tObj["value"].get_str());
if (tObj.count("data") > 0) if (tObj.count("data") > 0)
rlpStream << importData(tObj); rlpStream << importData(tObj);
@ -140,16 +137,10 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin)
rlpStream << bigint(tObj["v"].get_str()); rlpStream << bigint(tObj["v"].get_str());
if (tObj.count("r") > 0) if (tObj.count("r") > 0)
{ rlpStream << bigint(tObj["r"].get_str());
u256 r = h256(fromHex(tObj["r"].get_str()));
rlpStream << r;
}
if (tObj.count("s") > 0) if (tObj.count("s") > 0)
{ rlpStream << bigint(tObj["s"].get_str());
u256 s = h256(fromHex(tObj["s"].get_str()));
rlpStream << s;
}
if (tObj.count("extrafield") > 0) if (tObj.count("extrafield") > 0)
rlpStream << bigint(tObj["extrafield"].get_str()); rlpStream << bigint(tObj["extrafield"].get_str());