Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (srv *Server) BroadcastTransaction(txn *MsgDeSoTxn) ([]*MsgDeSoTxn, error)
// relay it to peers. When a transaction is created by the user there
// is no need to consider a rateLimit and also no need to verifySignatures
// because we generally will have done that already.
mempoolTxs, err := srv._addNewTxn(nil /*peer*/, txn, false /*rateLimit*/, false /*verifySignatures*/)
mempoolTxs, err := srv._addNewTxn(nil /*peer*/, txn, false /*rateLimit*/)
if err != nil {
return nil, errors.Wrapf(err, "BroadcastTransaction: ")
}
Expand Down Expand Up @@ -1965,8 +1965,7 @@ func (srv *Server) _relayTransactions() {
glog.V(3).Infof("Server._relayTransactions: Relay to all peers is complete!")
}

func (srv *Server) _addNewTxn(
pp *Peer, txn *MsgDeSoTxn, rateLimit bool, verifySignatures bool) ([]*MsgDeSoTxn, error) {
func (srv *Server) _addNewTxn(pp *Peer, txn *MsgDeSoTxn, rateLimit bool) ([]*MsgDeSoTxn, error) {

if srv.ReadOnlyMode {
err := fmt.Errorf("Server._addNewTxnAndRelay: Not processing txn from peer %v "+
Expand Down Expand Up @@ -2010,7 +2009,7 @@ func (srv *Server) _addNewTxn(
// PoW protocol. If we're on the PoW protocol, then we use the PoW mempool's,
// txn validity checks to signal whether the txn has been added or not.
if uint64(tipHeight) < srv.params.GetFinalPoWBlockHeight() {
_, err := srv.mempool.ProcessTransaction(txn, true, rateLimit, peerID, verifySignatures)
_, err := srv.mempool.ProcessTransaction(txn, true, rateLimit, peerID, true)
if err != nil {
return nil, errors.Wrapf(err, "Server._addNewTxn: Problem adding transaction to mempool: ")
}
Expand Down