Merge pull request #15 from icon-project/optimize_finding_undelvered_message

Optimize finding undelivered message

Author: eunsoo-icon

chain/eth2/client/consensus.go

@@ -6,21 +6,23 @@ import (
 	"io"
 	nhttp "net/http"
 	"strconv"
+	"time"
 
 	eth2client "github.com/attestantio/go-eth2-client"
 	api "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/http"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	"github.com/icon-project/btp2/common/errors"
 	"github.com/icon-project/btp2/common/log"
 	"github.com/rs/zerolog"
 )
 
 const (
 	TopicLCOptimisticUpdate = "light_client_optimistic_update"
 	TopicLCFinalityUpdate   = "light_client_finality_update"
+
+	requestTimeout = 5 * time.Second
 )
 
 type ConsensusLayer struct {
@@ -93,6 +95,8 @@ func (c *ConsensusLayer) GetReceiptsRootProof(slot int64) ([]byte, error) {
 	return io.ReadAll(resp.Body)
 }
 
+// SlotToBlockNumber returns execution block number for consensus slot
+// If slot has no block, returns (0, nil).
 func (c *ConsensusLayer) SlotToBlockNumber(slot phase0.Slot) (uint64, error) {
 	var sn phase0.Slot
 	if slot == 0 {
@@ -107,10 +111,7 @@ func (c *ConsensusLayer) SlotToBlockNumber(slot phase0.Slot) (uint64, error) {
 	}
 
 	block, err := c.BeaconBlock(strconv.FormatInt(int64(sn), 10))
-	if block == nil {
-		return 0, errors.NotFoundError.Errorf("there is no block at slot %d", slot)
-	}
-	if err != nil {
+	if err != nil || block == nil {
 		return 0, err
 	}
 	return block.BlockNumber()
@@ -124,6 +125,7 @@ func NewConsensusLayer(uri string, log log.Logger) (*ConsensusLayer, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	service, err := http.New(
 		ctx,
+		http.WithTimeout(requestTimeout),
 		http.WithAddress(uri),
 		http.WithLogLevel(zerolog.WarnLevel),
 	)

chain/eth2/proof/single.go

@@ -40,7 +40,7 @@ func NewSingleProof(data []byte) (*SingleProof, error) {
 	ssz := &ssz.Proof{}
 	proofType := int(data[0])
 	if proofType != 0 {
-		return nil, fmt.Errorf("invalid proof type. %d", proofType)
+		return nil, fmt.Errorf("invalid proof type. %s", data)
 	}
 	dataOffset := 1