From 35f271b264b8e4a0449eff325fb75a78299cf9a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 3 Aug 2015 21:57:09 +0200 Subject: miner, core: sort txs by price, nonce --- core/types/transaction.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'core') diff --git a/core/types/transaction.go b/core/types/transaction.go index 85b4c6119..28a7e02b3 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -289,3 +289,22 @@ type TxByNonce struct{ Transactions } func (s TxByNonce) Less(i, j int) bool { return s.Transactions[i].data.AccountNonce < s.Transactions[j].data.AccountNonce } + +type TxByPrice struct{ Transactions } + +func (s TxByPrice) Less(i, j int) bool { + return s.Transactions[i].data.Price.Cmp(s.Transactions[j].data.Price) > 0 +} + +type TxByPriceAndNonce struct{ Transactions } + +func (s TxByPriceAndNonce) Less(i, j int) bool { + // we can ignore the error here. Sorting shouldn't care about validness + ifrom, _ := s.Transactions[i].From() + jfrom, _ := s.Transactions[j].From() + // favour nonce if they are from the same recipient + if ifrom == jfrom { + return s.Transactions[i].data.AccountNonce < s.Transactions[j].data.AccountNonce + } + return s.Transactions[i].data.Price.Cmp(s.Transactions[j].data.Price) > 0 +} -- cgit v1.2.3