Merge latest changes from master and fix conflicts

Signed-off-by: Thane Thomson <connect@thanethomson.com>

test/e2e/app/app.go

@@ -356,12 +356,23 @@ func (app *Application) PrepareProposal(req abci.RequestPrepareProposal) abci.Re
 			Tx:     extTx,
 		}
 		return abci.ResponsePrepareProposal{
-			ModifiedTxStatus: abci.ResponsePrepareProposal_MODIFIED,
-			TxRecords:        txRecords,
+			TxRecords: txRecords,
 		}
 	}
 	// None of the transactions are modified by this application.
-	return abci.ResponsePrepareProposal{ModifiedTxStatus: abci.ResponsePrepareProposal_UNMODIFIED}
+	trs := make([]*abci.TxRecord, 0, len(req.Txs))
+	var totalBytes int64
+	for _, tx := range req.Txs {
+		totalBytes += int64(len(tx))
+		if totalBytes > req.MaxTxBytes {
+			break
+		}
+		trs = append(trs, &abci.TxRecord{
+			Action: abci.TxRecord_UNMODIFIED,
+			Tx:     tx,
+		})
+	}
+	return abci.ResponsePrepareProposal{TxRecords: trs}
 }
 
 // ProcessProposal implements part of the Application interface.