twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-02-02 09:54:29 +00:00
Code Issues Projects Releases Wiki Activity

create CScript overload for << string

Browse Source
This commit is contained in:
Miguel Freitas 2013-07-24 16:22:18 -03:00
parent 4d43b4a6f0
commit fe01fd01cb
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitcoind.cpp
View File

@ -130,7 +130,7 @@ static bool TestCreateSpamMsgTx()
{
CTransaction txNew;
txNew.message = CScript() << vector<unsigned char>((const unsigned char*)strSpamMessage.data(), (const unsigned char*)strSpamMessage.data() + strSpamMessage.size());
txNew.message = CScript() << strSpamMessage;
CBitcoinSecret bsecret1;
bsecret1.SetString (strSecret1C);
@ -169,7 +169,7 @@ static bool TestCreateSpamMsgTx()
hashMsg.ToString().c_str(), EncodeBase64(&vchSig[0], vchSig.size()).c_str() );
// add username and signature
txNew.userName = CScript() << vector<unsigned char>((const unsigned char*)strSpamUser.data(), (const unsigned char*)strSpamUser.data() + strSpamUser.size());
txNew.userName = CScript() << strSpamUser;
txNew.userName += CScript() << vchSig;
txNew.pubKey.clear(); // pubKey will be updated to include extranonce
txNew.nNonce = 0; // no update needed for spamMessage's nonce.

4
src/main.cpp
View File

@ -3511,7 +3511,7 @@ public:
static bool CreateSpamMsgTx(CTransaction &txNew)
{
txNew.message = CScript() << vector<unsigned char>((const unsigned char*)strSpamMessage.data(), (const unsigned char*)strSpamMessage.data() + strSpamMessage.size());
txNew.message = CScript() << strSpamMessage;
// get keyid from wallet (hopefully this is pubkey of strSpamUser)
CKeyID defaultKeyId( pwalletMain->vchDefaultKey.GetID() );
@ -3539,7 +3539,7 @@ static bool CreateSpamMsgTx(CTransaction &txNew)
hashMsg.ToString().c_str(), EncodeBase64(&vchSig[0], vchSig.size()).c_str() );
// add username and signature
txNew.userName = CScript() << vector<unsigned char>((const unsigned char*)strSpamUser.data(), (const unsigned char*)strSpamUser.data() + strSpamUser.size());
txNew.userName = CScript() << strSpamUser;
txNew.userName += CScript() << vchSig;
txNew.pubKey.clear(); // pubKey will be updated to include extranonce
txNew.nNonce = 0; // no update needed for spamMessage's nonce.

7
src/script.h
View File

@ -387,6 +387,13 @@ public:
return *this;
}
CScript& operator<<(const std::string &s)
{
const std::vector<unsigned char> b((const unsigned char*)s.data(),
(const unsigned char*)s.data() + s.size());
return operator<<(b);
}
CScript& operator<<(const CScript& b)
{
// I'm not sure if this should push the script or concatenate scripts.