diff options
author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-07-01 08:32:30 +0200 |
---|---|---|
committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-07-01 16:06:14 +0200 |
commit | 5496253966abec287ea61a648cb518d14903f91f (patch) | |
tree | a8ed0fc4e07bfff4ac064ef80ff75f4882f4fe86 /src/wallet/wallet.cpp | |
parent | 087e65def97fd3a2f61fa11b9f1cd2d7bc2f5f90 (diff) | |
download | bitcoin-5496253966abec287ea61a648cb518d14903f91f.tar.xz |
add CReserveScript to allow modular script keeping/returning
- use one CReserveScript per mining thread
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 997ca1e2f5..238f62a575 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2583,14 +2583,15 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx) } } -void CWallet::GetScriptForMining(CScript &script) +void CWallet::GetScriptForMining(boost::shared_ptr<CReserveScript> &script) { - CReserveKey reservekey(this); + boost::shared_ptr<CReserveKey> rKey(new CReserveKey(this)); CPubKey pubkey; - if (!reservekey.GetReservedKey(pubkey)) + if (!rKey->GetReservedKey(pubkey)) return; - script = CScript() << ToByteVector(pubkey) << OP_CHECKSIG; - reservekey.KeepKey(); + + script = rKey; + script->reserveScript = CScript() << ToByteVector(pubkey) << OP_CHECKSIG; } void CWallet::LockCoin(COutPoint& output) |