From 2f648fb91c7225727aa4801e3fcda3f5f7d22d84 Mon Sep 17 00:00:00 2001
From: Shivam Sharma <shivam691999@gmail.com>
Date: Fri, 21 Oct 2022 05:38:45 +0530
Subject: [PATCH] chg : fix derference error on config without borTraceEnabled

---
 eth/tracers/api.go | 47 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index c5ba6b9779..4534f4675f 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -65,6 +65,8 @@ const (
 	defaultTracechainMemLimit = common.StorageSize(500 * 1024 * 1024)
 )
 
+var defaultBorTraceEnabled = newBoolPtr(false)
+
 // Backend interface provides the common API services (that are provided by
 // both full and light clients) with access to necessary functions.
 type Backend interface {
@@ -269,10 +271,13 @@ func (api *API) TraceChain(ctx context.Context, start, end rpc.BlockNumber, conf
 func (api *API) traceChain(ctx context.Context, start, end *types.Block, config *TraceConfig) (*rpc.Subscription, error) {
 	if config == nil {
 		config = &TraceConfig{
-			BorTraceEnabled: newBoolPtr(false),
+			BorTraceEnabled: defaultBorTraceEnabled,
 			BorTx:           newBoolPtr(false),
 		}
 	}
+	if config.BorTraceEnabled == nil {
+		config.BorTraceEnabled = defaultBorTraceEnabled
+	}
 	// Tracing a chain is a **long** operation, only do with subscriptions
 	notifier, supported := rpc.NotifierFromContext(ctx)
 	if !supported {
@@ -308,6 +313,10 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
 				blockCtx := core.NewEVMBlockContext(task.block.Header(), api.chainContext(localctx), nil)
 				// Trace all the transactions contained within
 				txs, stateSyncPresent := api.getAllBlockTransactions(ctx, task.block)
+				if !*config.BorTraceEnabled && stateSyncPresent {
+					txs = txs[:len(txs)-1]
+					stateSyncPresent = false
+				}
 				for i, tx := range txs {
 					msg, _ := tx.AsMessage(signer, task.block.BaseFee())
 					txctx := &Context{
@@ -324,8 +333,6 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
 						if *config.BorTraceEnabled {
 							config.BorTx = newBoolPtr(true)
 							res, err = api.traceTx(localctx, msg, txctx, blockCtx, task.statedb, config)
-						} else {
-							break
 						}
 					} else {
 						res, err = api.traceTx(localctx, msg, txctx, blockCtx, task.statedb, config)
@@ -567,10 +574,13 @@ func prepareCallMessage(msg core.Message) statefull.Callmsg {
 func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config *TraceConfig) ([]common.Hash, error) {
 	if config == nil {
 		config = &TraceConfig{
-			BorTraceEnabled: newBoolPtr(false),
+			BorTraceEnabled: defaultBorTraceEnabled,
 			BorTx:           newBoolPtr(false),
 		}
 	}
+	if config.BorTraceEnabled == nil {
+		config.BorTraceEnabled = defaultBorTraceEnabled
+	}
 
 	block, _ := api.blockByHash(ctx, hash)
 	if block == nil {
@@ -669,10 +679,13 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
 
 	if config == nil {
 		config = &TraceConfig{
-			BorTraceEnabled: newBoolPtr(false),
+			BorTraceEnabled: defaultBorTraceEnabled,
 			BorTx:           newBoolPtr(false),
 		}
 	}
+	if config.BorTraceEnabled == nil {
+		config.BorTraceEnabled = defaultBorTraceEnabled
+	}
 
 	if block.NumberU64() == 0 {
 		return nil, errors.New("genesis is not traceable")
@@ -779,7 +792,12 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
 	if failed != nil {
 		return nil, failed
 	}
-	return results, nil
+
+	if !*config.BorTraceEnabled && stateSyncPresent {
+		return results[:len(results)-1], nil
+	} else {
+		return results, nil
+	}
 }
 
 // standardTraceBlockToFile configures a new tracer which uses standard JSON output,
@@ -939,10 +957,14 @@ func (api *API) containsTx(ctx context.Context, block *types.Block, hash common.
 func (api *API) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) {
 	if config == nil {
 		config = &TraceConfig{
-			BorTraceEnabled: newBoolPtr(false),
+			BorTraceEnabled: defaultBorTraceEnabled,
 			BorTx:           newBoolPtr(false),
 		}
 	}
+	if config.BorTraceEnabled == nil {
+		config.BorTraceEnabled = defaultBorTraceEnabled
+	}
+
 	tx, blockHash, blockNumber, index, err := api.backend.GetTransaction(ctx, hash)
 	if tx == nil {
 		// For BorTransaction, there will be no trace available
@@ -1041,6 +1063,17 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 // executes the given message in the provided environment. The return value will
 // be tracer dependent.
 func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Context, vmctx vm.BlockContext, statedb *state.StateDB, config *TraceConfig) (interface{}, error) {
+
+	if config == nil {
+		config = &TraceConfig{
+			BorTraceEnabled: defaultBorTraceEnabled,
+			BorTx:           newBoolPtr(false),
+		}
+	}
+	if config.BorTraceEnabled == nil {
+		config.BorTraceEnabled = defaultBorTraceEnabled
+	}
+
 	// Assemble the structured logger or the JavaScript tracer
 	var (
 		tracer    vm.EVMLogger