Resolve compiling problem after merging from get-1.10.13

Author: zzyalbert

core/tx_jam_indexer.go

@@ -114,7 +114,7 @@ func (indexer *txJamIndexer) updateLoop() {
 			indexer.head = h
 		case <-tick.C:
 			d := indexer.undCounter.Sum()
-			pendings, _ := indexer.pool.Pending(true)
+			pendings := indexer.pool.Pending(true)
 			if d == 0 && len(pendings) == 0 {
 				break
 			}

eth/gasprice/prediction.go

@@ -140,11 +140,7 @@ func (p *Prediction) loop() {
 }
 
 func (p *Prediction) update() {
-	txs, err := p.pool.Pending(true)
-	if err != nil {
-		log.Error("failed to get pending transactions", "err", err)
-		return
-	}
+	txs := p.pool.Pending(true)
 	byprice := make(TxByPrice, 0, len(txs))
 	for _, ts := range txs {
 		byprice = append(byprice, ts...)

eth/tracers/api.go

@@ -986,7 +986,7 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Contex
 func (api *API) tracePoSASysTx(ctx context.Context, sender common.Address, tx *types.Transaction, txctx *Context, vmctx vm.BlockContext, statedb *state.StateDB, config *TraceConfig) (interface{}, error) {
 	// Assemble the structured logger or the JavaScript tracer
 	var (
-		tracer vm.Tracer
+		tracer vm.EVMLogger
 		err    error
 	)
 	switch {
@@ -1007,7 +1007,7 @@ func (api *API) tracePoSASysTx(ctx context.Context, sender common.Address, tx *t
 		go func() {
 			<-deadlineCtx.Done()
 			if deadlineCtx.Err() == context.DeadlineExceeded {
-				tracer.(*Tracer).Stop(errors.New("execution timeout"))
+				tracer.(Tracer).Stop(errors.New("execution timeout"))
 			}
 		}()
 		defer cancel()
@@ -1032,7 +1032,7 @@ func (api *API) tracePoSASysTx(ctx context.Context, sender common.Address, tx *t
 	})
 }
 
-func (api *API) traceResult(tracer vm.Tracer, result *core.ExecutionResult) (interface{}, error) {
+func (api *API) traceResult(tracer vm.EVMLogger, result *core.ExecutionResult) (interface{}, error) {
 	// Depending on the tracer type, format and return the output.
 	switch tracer := tracer.(type) {
 	case *vm.StructLogger:

internal/ethapi/api.go

@@ -34,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/consensus/misc"
@@ -849,7 +850,7 @@ func (s *PublicBlockChainAPI) getSysTransactions(block *types.Block, posa consen
 	for i, tx := range txs {
 		sender, _ := types.Sender(signer, tx)
 		if yes, _ := posa.IsSysTransaction(sender, tx, header); yes {
-			transactions = append(transactions, newRPCTransaction(tx, bhash, bnumber, uint64(i), nil))
+			transactions = append(transactions, newRPCTransaction(tx, bhash, bnumber, uint64(i), nil, s.b.ChainConfig()))
 		}
 	}
 	return transactions, nil