Merge branch 'master' into tracer

client/client.go

@@ -25,6 +25,7 @@ type Client interface {
 	TransactionByHash(context.Context, ethcommon.Hash) (*ethtypes.Transaction, bool, error)
 	TransactionReceipt(context.Context, ethcommon.Hash) (*ethtypes.Receipt, error)
 	TraceTransaction(context.Context, string) (*Call, []*FlatCall, error)
+	TraceBlockByHash(context.Context, string) ([]*Call, [][]*FlatCall, error)
 	SendTransaction(context.Context, *ethtypes.Transaction) error
 	BalanceAt(context.Context, ethcommon.Address, *big.Int) (*big.Int, error)
 	NonceAt(context.Context, ethcommon.Address, *big.Int) (uint64, error)

client/eth.go

@@ -54,13 +54,35 @@ func (c *EthClient) TxPoolContent(ctx context.Context) (*TxPoolContent, error) {
 
 // TraceTransaction returns a transaction trace
 func (c *EthClient) TraceTransaction(ctx context.Context, hash string) (*Call, []*FlatCall, error) {
-	result := &Call{}
+	var result Call
 	args := []interface{}{hash, c.traceConfig}
 
-	err := c.rpc.SendJSONRPCRequest(ctx, prefixEth, "debug_traceTransaction", args, &result)
-	if err != nil {
+	if err := c.rpc.SendJSONRPCRequest(ctx, prefixEth, "debug_traceTransaction", args, &result); err != nil {
 		return nil, nil, err
 	}
+
 	flattened := result.init()
+
+	return &result, flattened, nil
+}
+
+// TraceBlockByHash returns the transaction traces of all transactions in the block
+func (c *EthClient) TraceBlockByHash(ctx context.Context, hash string) ([]*Call, [][]*FlatCall, error) {
+	var raw []struct {
+		*Call `json:"result"`
+	}
+
+	args := []interface{}{hash, c.traceConfig}
+	if err := c.rpc.SendJSONRPCRequest(ctx, prefixEth, "debug_traceBlockByHash", args, &raw); err != nil {
+		return nil, nil, err
+	}
+
+	result := make([]*Call, len(raw))
+	flattened := make([][]*FlatCall, len(raw))
+	for i, tx := range raw {
+		result[i] = tx.Call
+		flattened[i] = tx.Call.init()
+	}
+
 	return result, flattened, nil
 }

service/service_block.go

@@ -141,8 +141,13 @@ func (s *BlockService) BlockTransaction(
 		return nil, nil
 	}
 
-	transaction, terr := s.fetchTransaction(ctx, tx, header)
+	trace, flattened, err := s.client.TraceTransaction(ctx, tx.Hash().String())
 	if err != nil {
+		return nil, wrapError(errClientError, err)
+	}
+
+	transaction, terr := s.fetchTransaction(ctx, tx, header, trace, flattened)
+	if terr != nil {
 		return nil, terr
 	}
 
@@ -157,11 +162,17 @@ func (s *BlockService) fetchTransactions(
 ) ([]*types.Transaction, *types.Error) {
 	transactions := []*types.Transaction{}
 
-	for _, tx := range block.Transactions() {
-		transaction, err := s.fetchTransaction(ctx, tx, block.Header())
-		if err != nil {
-			return nil, err
+	trace, flattened, err := s.client.TraceBlockByHash(ctx, block.Hash().String())
+	if err != nil {
+		return nil, wrapError(errClientError, err)
+	}
+
+	for i, tx := range block.Transactions() {
+		transaction, terr := s.fetchTransaction(ctx, tx, block.Header(), trace[i], flattened[i])
+		if terr != nil {
+			return nil, terr
 		}
+
 		transactions = append(transactions, transaction)
 	}
 
@@ -172,6 +183,8 @@ func (s *BlockService) fetchTransaction(
 	ctx context.Context,
 	tx *corethTypes.Transaction,
 	header *corethTypes.Header,
+	trace *client.Call,
+	flattened []*client.FlatCall,
 ) (*types.Transaction, *types.Error) {
 	msg, err := tx.AsMessage(s.config.Signer(), header.BaseFee)
 	if err != nil {
@@ -183,11 +196,6 @@ func (s *BlockService) fetchTransaction(
 		return nil, wrapError(errClientError, err)
 	}
 
-	trace, flattened, err := s.client.TraceTransaction(ctx, tx.Hash().String())
-	if err != nil {
-		return nil, wrapError(errClientError, err)
-	}
-
 	transaction, err := mapper.Transaction(header, tx, &msg, receipt, trace, flattened, s.client, s.config.IsAnalyticsMode(), s.config.TokenWhiteList, s.config.IndexUnknownTokens)
 	if err != nil {
 		return nil, wrapError(errInternalError, err)