fix: use log block number for refresh session iD

Author: mpetrun5

chains/evm/calls/events/listener.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/rs/zerolog/log"
 
@@ -45,12 +46,11 @@ func (l *Listener) FetchKeygenEvents(ctx context.Context, contractAddress common
 	return logs, nil
 }
 
-func (l *Listener) FetchRefreshEvents(ctx context.Context, contractAddress common.Address, startBlock *big.Int, endBlock *big.Int) ([]*Refresh, error) {
+func (l *Listener) FetchRefreshEvents(ctx context.Context, contractAddress common.Address, startBlock *big.Int, endBlock *big.Int) (*Refresh, types.Log, error) {
 	logs, err := l.client.FetchEventLogs(ctx, contractAddress, string(KeyRefreshSig), startBlock, endBlock)
 	if err != nil {
-		return nil, err
+		return nil, types.Log{}, err
 	}
-	refreshEvents := make([]*Refresh, 0)
 
 	for _, re := range logs {
 		r, err := l.UnpackRefresh(l.abi, re.Data)
@@ -59,10 +59,10 @@ func (l *Listener) FetchRefreshEvents(ctx context.Context, contractAddress commo
 			continue
 		}
 
-		refreshEvents = append(refreshEvents, r)
+		return r, re, nil
 	}
 
-	return refreshEvents, nil
+	return nil, types.Log{}, nil
 }
 
 func (l *Listener) UnpackRefresh(abi abi.ABI, data []byte) (*Refresh, error) {

chains/evm/listener/tss.go

@@ -26,7 +26,7 @@ import (
 
 type EventListener interface {
 	FetchKeygenEvents(ctx context.Context, address common.Address, startBlock *big.Int, endBlock *big.Int) ([]types.Log, error)
-	FetchRefreshEvents(ctx context.Context, address common.Address, startBlock *big.Int, endBlock *big.Int) ([]*events.Refresh, error)
+	FetchRefreshEvents(ctx context.Context, address common.Address, startBlock *big.Int, endBlock *big.Int) (*events.Refresh, types.Log, error)
 }
 
 type KeygenEventHandler struct {
@@ -143,22 +143,17 @@ func (eh *RefreshEventHandler) HandleEvents(
 	startBlock *big.Int,
 	endBlock *big.Int,
 ) error {
-	refreshEvents, err := eh.eventListener.FetchRefreshEvents(
+	refreshEvent, l, err := eh.eventListener.FetchRefreshEvents(
 		context.Background(), eh.bridgeAddress, startBlock, endBlock,
 	)
 	if err != nil {
 		return fmt.Errorf("unable to fetch keygen events because of: %+v", err)
 	}
-	if len(refreshEvents) == 0 {
+	if refreshEvent == nil {
 		return nil
 	}
 
-	hash := refreshEvents[len(refreshEvents)-1].Hash
-	if hash == "" {
-		log.Error().Msgf("Hash cannot be empty string")
-		return nil
-	}
-	topology, err := eh.topologyProvider.NetworkTopology(hash)
+	topology, err := eh.topologyProvider.NetworkTopology(refreshEvent.Hash)
 	if err != nil {
 		log.Error().Err(err).Msgf("Failed fetching network topology")
 		return nil
@@ -177,7 +172,7 @@ func (eh *RefreshEventHandler) HandleEvents(
 	)
 
 	resharing := resharing.NewResharing(
-		eh.sessionID(startBlock), topology.Threshold, eh.host, eh.communication, eh.ecdsaStorer,
+		eh.sessionID(new(big.Int).SetUint64(l.BlockNumber)), topology.Threshold, eh.host, eh.communication, eh.ecdsaStorer,
 	)
 	err = eh.coordinator.Execute(context.Background(), []tss.TssProcess{resharing}, make(chan interface{}, 1), peer.ID(""))
 	if err != nil {