highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support 3 new multisignature IsStandard transactions

Browse Source 
Initial support for (a and b), (a or b), and 2-of-3 escrow
transactions (where a, b, and c are keys).
This commit is contained in:
Gavin Andresen
2011-09-28 12:30:06 -04:00
parent 1466b8b78a
commit bf798734db
5 changed files with 578 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet.cpp
View File

@@ -997,12 +997,11 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
vector<unsigned char> vchPubKey = reservekey.GetReservedKey();
// assert(mapKeys.count(vchPubKey));
// Fill a vout to ourself, using same address type as the payment
// Fill a vout to ourself
// TODO: pass in scriptChange instead of reservekey so
// change transaction isn't always pay-to-bitcoin-address
CScript scriptChange;
if (vecSend[0].first.GetBitcoinAddress().IsValid())
scriptChange.SetBitcoinAddress(vchPubKey);
else
scriptChange << vchPubKey << OP_CHECKSIG;
scriptChange.SetBitcoinAddress(vchPubKey);
// Insert change txn at random position:
vector<CTxOut>::iterator position = wtxNew.vout.begin()+GetRandInt(wtxNew.vout.size());