fixup Add segregated witness transaction serialization: add missing witness flags

sipa · sipa · commit 5d6b6e288db5 · 2016-04-23T13:53:09.000+02:00
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -332,7 +332,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
             return TransactionCommitFailed;
 
         CTransaction* t = (CTransaction*)newTx;
-        CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+        CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_WITNESS);
         ssTx << *t;
         transaction_array.append(&(ssTx[0]), ssTx.size());
     }
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
@@ -145,7 +145,7 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
     LogPrint("zmq", "zmq: Publish rawblock %s\n", pindex->GetBlockHash().GetHex());
 
     const Consensus::Params& consensusParams = Params().GetConsensus();
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_WITNESS);
     {
         LOCK(cs_main);
         CBlock block;
@@ -166,7 +166,7 @@ bool CZMQPublishRawTransactionNotifier::NotifyTransaction(const CTransaction &tr
 {
     uint256 hash = transaction.GetHash();
     LogPrint("zmq", "zmq: Publish rawtx %s\n", hash.GetHex());
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_WITNESS);
     ss << transaction;
     int rc = zmq_send_multipart(psocket, "rawtx", 5, &(*ss.begin()), ss.size(), 0);
     return rc == 0;

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran`
`332`	`332`	`return TransactionCommitFailed;`
`333`	`333`
`334`	`334`	`CTransaction* t = (CTransaction*)newTx;`
`335`		`- CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);`
	`335`	`+ CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION \| SERIALIZE_TRANSACTION_WITNESS);`
`336`	`336`	`ssTx << *t;`
`337`	`337`	`transaction_array.append(&(ssTx[0]), ssTx.size());`
`338`	`338`	`}`