chore_: remove CallBlockHashByTransaction workaround for bad block hash calculation

Author: dlipicar

rpc/chain/client.go

@@ -783,24 +783,6 @@ func (c *ClientWithFallback) GetBaseFeeFromBlock(ctx context.Context, blockNumbe
 	return baseGasFee, err
 }
 
-func (c *ClientWithFallback) CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error) {
-	rpcstats.CountCallWithTag("eth_FullTransactionByBlockNumberAndIndex", c.tag)
-
-	res, err := c.makeCall(
-		ctx, c.ethClients, func(client ethclient.RPSLimitedEthClientInterface) (interface{}, error) {
-			return client.CallBlockHashByTransaction(ctx, blockNumber, index)
-		},
-	)
-
-	c.toggleConnectionState(err)
-
-	if err != nil {
-		return common.HexToHash(""), err
-	}
-
-	return res.(common.Hash), nil
-}
-
 func (c *ClientWithFallback) GetWalletNotifier() func(chainId uint64, message string) {
 	return c.WalletNotifier
 }

rpc/chain/ethclient/eth_client.go

@@ -62,7 +62,6 @@ type EthClientInterface interface {
 	GetBaseFeeFromBlock(ctx context.Context, blockNumber *big.Int) (string, error)
 	bind.ContractCaller
 	bind.ContractBackend
-	CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error)
 }
 
 // EthClient implements EthClientInterface
@@ -82,13 +81,6 @@ func (ec *EthClient) BatchCallContext(ctx context.Context, b []rpc.BatchElem) er
 	return ec.rpcClient.BatchCallContext(ctx, b)
 }
 
-// go-ethereum's `Transaction` items drop the blkHash obtained during the RPC call.
-// This function preserves the additional data. This is the cheapest way to obtain
-// the block hash for a given block number.
-func (ec *EthClient) CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error) {
-	return callBlockHashByTransaction(ctx, ec.rpcClient, blockNumber, index)
-}
-
 func (ec *EthClient) GetBaseFeeFromBlock(ctx context.Context, blockNumber *big.Int) (string, error) {
 	feeHistory, err := ec.FeeHistory(ctx, 1, blockNumber, nil)
 

rpc/chain/ethclient/rpc.go

@@ -15,7 +15,6 @@ type Reader interface {
 	BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error)
 	NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error)
 	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
-	CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error)
 	NetworkID() uint64
 }
 

rpc/chain/mock/client/client.go

@@ -232,9 +232,10 @@ func (tc *TestClient) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([
 	logs := []types.Log{}
 	for _, transfer := range allTransfers {
 		if transfer.block.Cmp(q.FromBlock) >= 0 && transfer.block.Cmp(q.ToBlock) <= 0 {
+			header := getTestHeader(transfer.block)
 			log := types.Log{
-				BlockNumber: transfer.block.Uint64(),
-				BlockHash:   common.BigToHash(transfer.block),
+				BlockNumber: header.Number.Uint64(),
+				BlockHash:   header.Hash(),
 			}
 
 			// Use the address at least in one any(from/to) topic to trick the implementation
@@ -287,6 +288,18 @@ func (tc *TestClient) tokenBalanceAt(account common.Address, token common.Addres
 	return balance
 }
 
+func getTestHeader(number *big.Int) *types.Header {
+	return &types.Header{
+		Number:     big.NewInt(0).Set(number),
+		Time:       0,
+		Difficulty: big.NewInt(0),
+		ParentHash: common.Hash{},
+		Nonce:      types.BlockNonce{},
+		MixDigest:  common.Hash{},
+		Extra:      make([]byte, 0),
+	}
+}
+
 func (tc *TestClient) HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error) {
 	if number == nil {
 		number = big.NewInt(int64(tc.currentBlock))
@@ -297,22 +310,11 @@ func (tc *TestClient) HeaderByNumber(ctx context.Context, number *big.Int) (*typ
 		return nil, err
 	}
 
-	header := &types.Header{
-		Number: number,
-		Time:   0,
-	}
+	header := getTestHeader(number)
 
 	return header, nil
 }
 
-func (tc *TestClient) CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error) {
-	err := tc.countAndlog("CallBlockHashByTransaction")
-	if err != nil {
-		return common.Hash{}, err
-	}
-	return common.BigToHash(blockNumber), nil
-}
-
 func (tc *TestClient) GetBaseFeeFromBlock(ctx context.Context, blockNumber *big.Int) (string, error) {
 	err := tc.countAndlog("GetBaseFeeFromBlock")
 	return "", err

rpc/chain/mock/client/ethclient/eth_client.go

@@ -177,17 +177,11 @@ func checkRangesWithStartBlock(parent context.Context, client balance.Reader, ca
 				}
 			}
 			if new(big.Int).Sub(to, from).Cmp(one) == 0 {
-				// WARNING: Block hash calculation from plain header returns a wrong value.
 				header, err := client.HeaderByNumber(ctx, to)
 				if err != nil {
 					return err
 				}
-				// Obtain block hash from first transaction
-				blockHash, err := client.CallBlockHashByTransaction(ctx, to, 0)
-				if err != nil {
-					return err
-				}
-				c.PushHeader(toDBHeader(header, blockHash, account))
+				c.PushHeader(toDBHeader(header, account))
 				return nil
 			}
 			mid := new(big.Int).Add(from, to)

rpc/chain/mock/client/ethclient/rps_limited_eth_client.go

@@ -81,10 +81,6 @@ func (f balancesFixture) NetworkID() uint64 {
 	return 0
 }
 
-func (f balancesFixture) CallBlockHashByTransaction(ctx context.Context, blockNumber *big.Int, index uint) (common.Hash, error) {
-	return common.HexToHash("0x0"), nil
-}
-
 type batchesFixture [][]Transfer
 
 func (f batchesFixture) GetTransfersByNumber(ctx context.Context, number *big.Int) (rst []Transfer, err error) {