Sunce86/fix tx pool locals for 1559 (#431)
* fixed handling of local txs after 1559 activation
This commit is contained in:
committed by
GitHub
parent
b928380b64
commit
5dec58ba9f
@@ -1169,7 +1169,7 @@ impl miner::MinerService for Miner {
|
||||
ordering: miner::PendingOrdering,
|
||||
) -> Vec<Arc<VerifiedTransaction>>
|
||||
where
|
||||
C: ChainInfo + Nonce + Sync,
|
||||
C: BlockChain + Nonce + Sync,
|
||||
{
|
||||
let chain_info = chain.chain_info();
|
||||
|
||||
@@ -1186,7 +1186,10 @@ impl miner::MinerService for Miner {
|
||||
nonce_cap,
|
||||
max_len,
|
||||
ordering,
|
||||
includable_boundary: Default::default(),
|
||||
includable_boundary: self
|
||||
.engine
|
||||
.calculate_base_fee(&chain.best_block_header())
|
||||
.unwrap_or_default(),
|
||||
};
|
||||
|
||||
if let Some(ref f) = filter {
|
||||
|
||||
@@ -226,7 +226,7 @@ pub trait MinerService: Send + Sync {
|
||||
ordering: PendingOrdering,
|
||||
) -> Vec<Arc<VerifiedTransaction>>
|
||||
where
|
||||
C: ChainInfo + Nonce + Sync;
|
||||
C: BlockChain + Nonce + Sync;
|
||||
|
||||
/// Get an unfiltered list of all ready transactions.
|
||||
fn ready_transactions<C>(
|
||||
@@ -236,7 +236,7 @@ pub trait MinerService: Send + Sync {
|
||||
ordering: PendingOrdering,
|
||||
) -> Vec<Arc<VerifiedTransaction>>
|
||||
where
|
||||
C: ChainInfo + Nonce + Sync,
|
||||
C: BlockChain + Nonce + Sync,
|
||||
{
|
||||
self.ready_transactions_filtered(chain, max_len, None, ordering)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user