[AV-1753] merge coreth 0.8.12 (#132)

* merge coreth 0.8.12

* add nits (#133)

Co-authored-by: Patrick O'Grady <prohb125@gmail.com>

accounts/abi/bind/backends/simulated.go

@@ -149,6 +149,7 @@ func (b *SimulatedBackend) Commit(accept bool) {
 		if err := b.blockchain.Accept(b.acceptedBlock); err != nil {
 			panic(err)
 		}
+		b.blockchain.DrainAcceptorQueue()
 	}
 	// Using the last inserted block here makes it possible to build on a side
 	// chain after a fork.

chain/subnet_evm.go

@@ -140,7 +140,14 @@ func (self *ETHChain) Reject(block *types.Block) error {
 	return self.BlockChain().Reject(block)
 }
 
-// LastAcceptedBlock returns the last block to be marked as accepted.
+// LastConsensusAcceptedBlock returns the last block to be marked as accepted.
+// It may or may not be processed.
+func (self *ETHChain) LastConsensusAcceptedBlock() *types.Block {
+	return self.BlockChain().LastConsensusAcceptedBlock()
+}
+
+// LastAcceptedBlock returns the last block to be marked as accepted and
+// processed.
 func (self *ETHChain) LastAcceptedBlock() *types.Block {
 	return self.BlockChain().LastAcceptedBlock()
 }

chain/subscribe_accepted_heads_test.go

@@ -94,6 +94,7 @@ func TestAcceptedHeadSubscriptions(t *testing.T) {
 	if err := chain.Accept(block); err != nil {
 		t.Fatal(err)
 	}
+	chain.BlockChain().DrainAcceptorQueue()
 
 	select {
 	case fb := <-acceptedChainCh:

chain/subscribe_block_logs_test.go

@@ -230,6 +230,7 @@ func TestBlockLogsAllowUnfinalized(t *testing.T) {
 	if err := chain.Accept(block); err != nil {
 		t.Fatal(err)
 	}
+	chain.BlockChain().DrainAcceptorQueue()
 
 	chain.BlockChain().GetVMConfig().AllowUnfinalizedQueries = false
 	logs, err = api.GetLogs(ctx, fc)