diff options
| author | Suhas Daftuar <sdaftuar@chaincode.com> | 2017-09-03 08:43:35 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-10-04 11:47:44 +0200 |
| commit | 6b4d9f273607bcacaa65a7a030eef5cc9d6bb6e8 (patch) | |
| tree | 533adb0369c613f550c8b5a88ca8953a3e0cafb4 /src/wallet | |
| parent | 62d18cdb893fea92680a6f382bb8b3e8ca157bcf (diff) | |
| download | bitcoin-6b4d9f273607bcacaa65a7a030eef5cc9d6bb6e8.tar.xz | |
wallet: update stored witness in AddToWallet
Replace witness-stripped wallet transactions with full transactions;
this can happen when upgrading from a pre-segwit wallet to a segwit-
aware wallet.
Github-Pull: #11225
Rebased-From: d01a9682b126a5f83c7311e652e6e62f2c2e1d20
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index bf8981e4e8..5e833ebee7 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -969,6 +969,15 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose) wtx.fFromMe = wtxIn.fFromMe; fUpdated = true; } + // If we have a witness-stripped version of this transaction, and we + // see a new version with a witness, then we must be upgrading a pre-segwit + // wallet. Store the new version of the transaction with the witness, + // as the stripped-version must be invalid. + // TODO: Store all versions of the transaction, instead of just one. + if (wtxIn.tx->HasWitness() && !wtx.tx->HasWitness()) { + wtx.SetTx(wtxIn.tx); + fUpdated = true; + } } //// debug print |