ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/Transaction.cpp
This commit is contained in:
JoelKatz
2012-10-01 15:22:37 -07:00
parent 79c35f2689 0b49c0dee9
commit 18d3773da4
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Transaction.cpp
View File

@@ -298,8 +298,7 @@ Transaction::pointer Transaction::setNicknameSet(
const NewcoinAddress& naPrivateKey,
const uint256& uNickname,
bool bSetOffer,
const STAmount& saMinimumOffer,
const std::vector<unsigned char>& vucSignature)
const STAmount& saMinimumOffer)
{
mTransaction->setValueFieldH256(sfNickname, uNickname);
@@ -307,9 +306,6 @@ Transaction::pointer Transaction::setNicknameSet(
if (bSetOffer)
mTransaction->setValueFieldAmount(sfMinimumOffer, saMinimumOffer);
if (!vucSignature.empty())
mTransaction->setValueFieldVL(sfSignature, vucSignature);
sign(naPrivateKey);
return shared_from_this();
@@ -325,12 +321,11 @@ Transaction::pointer Transaction::sharedNicknameSet(
uint32 uSourceTag,
const uint256& uNickname,
bool bSetOffer,
const STAmount& saMinimumOffer,
const std::vector<unsigned char>& vucSignature)
const STAmount& saMinimumOffer)
{
pointer tResult = boost::make_shared<Transaction>(ttNICKNAME_SET, naPublicKey, naSourceAccount, uSeq, saFee, uSourceTag);
return tResult->setNicknameSet(naPrivateKey, uNickname, bSetOffer, saMinimumOffer, vucSignature);
return tResult->setNicknameSet(naPrivateKey, uNickname, bSetOffer, saMinimumOffer);
}
//