Pool: eviction works, use correct minBaseFee (#48)

ledgerwatch · Aug 30, 2021 · 29bf077 · 29bf077
1 parent d474087
commit 29bf077
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 151 deletions.
diff --git a/kv/tables.go b/kv/tables.go
@@ -350,7 +350,7 @@ const (
 	PoolSenderIDToAdress   = "PoolSenderIDToAddress"  // sender_id_u64 -> sender_20bytes
 	PoolSender             = "PoolSender"             // sender_id_u64 -> nonce, balance
 	PoolTransaction        = "PoolTransaction"        // txHash -> sender_id_u64+blockNum_u64+tx_rlp
-	PoolStateEviction      = "PoolStateEviction"      // commit_id_u64 -> [sender_id_u64]  - list of senders who had no transactions at this time, if after some time they still have no transactions - evict them.
+	PoolStateEviction      = "PoolStateEviction"      // commit_id_u64 -> roaring([sender_id_u64])  - list of senders who had no transactions at this time, if after some time they still have no transactions - evict them.
 	PoolInfo               = "PoolInfo"               // option_key -> option_value
 )
 

diff --git a/txpool/fetch.go b/txpool/fetch.go
@@ -435,7 +435,7 @@ func (f *Fetch) handleStateChanges(ctx context.Context, client remote.KVClient)
 			addr := gointerfaces.ConvertH160toAddress(change.Address)
 			diff[string(addr[:])] = senderInfo{nonce: nonce, balance: balance}
 		}
-		if err := f.pool.OnNewBlock(diff, unwindTxs, minedTxs, req.ProtocolBaseFee, 0, req.BlockHeight, gointerfaces.ConvertH256ToHash(req.BlockHash), f.senders); err != nil {
+		if err := f.pool.OnNewBlock(diff, unwindTxs, minedTxs, req.ProtocolBaseFee, req.BlockHeight, gointerfaces.ConvertH256ToHash(req.BlockHash), f.senders); err != nil {
 			log.Warn("onNewBlock", "err", err)
 		}
 		if f.wg != nil {

diff --git a/txpool/mocks_test.go b/txpool/mocks_test.go