Add error handling for resharing session init

Author: anhthii

pkg/eventconsumer/event_consumer.go

@@ -637,11 +637,19 @@ func (ec *eventConsumer) consumeReshareEvent() error {
 		ctx := context.Background()
 		var wg sync.WaitGroup
 		if oldSession != nil {
-			oldSession.Init()
+			err := oldSession.Init()
+			if err != nil {
+				ec.handleReshareSessionError(walletID, keyType, msg.NewThreshold, err, "Failed to init old reshare session", natMsg)
+				return
+			}
 			oldSession.ListenToIncomingMessageAsync()
 		}
 		if newSession != nil {
-			newSession.Init()
+			err := newSession.Init()
+			if err != nil {
+				ec.handleReshareSessionError(walletID, keyType, msg.NewThreshold, err, "Failed to init new reshare session", natMsg)
+				return
+			}
 			newSession.ListenToIncomingMessageAsync()
 		}
 

pkg/mpc/ecdsa_resharing_session.go

@@ -18,7 +18,7 @@ import (
 
 type ReshareSession interface {
 	Session
-	Init()
+	Init() error
 	Reshare(done func())
 	GetPubKeyResult() []byte
 }
@@ -99,7 +99,7 @@ func NewECDSAReshareSession(
 	}
 }
 
-func (s *ecdsaReshareSession) Init() {
+func (s *ecdsaReshareSession) Init() error {
 	logger.Infof("Initializing resharing session with partyID: %s, newPartyIDs %s", s.selfPartyID, s.partyIDs)
 	var share keygen.LocalPartySaveData
 
@@ -110,15 +110,15 @@ func (s *ecdsaReshareSession) Init() {
 	} else {
 		err := s.loadOldShareDataGeneric(s.walletID, s.GetVersion(), &share)
 		if err != nil {
-			s.ErrCh <- err
-			return
+			return fmt.Errorf("failed to load old share data ecdsa: %w", err)
 		}
 	}
 
 	s.party = resharing.NewLocalParty(s.reshareParams, share, s.outCh, s.endCh)
 
 	logger.Infof("[INITIALIZED] Initialized resharing session successfully partyID: %s, peerIDs %s, walletID %s, oldThreshold = %d, newThreshold = %d",
 		s.selfPartyID, s.partyIDs, s.walletID, s.threshold, s.reshareParams.NewThreshold())
+	return nil
 }
 
 func (s *ecdsaReshareSession) Reshare(done func()) {

pkg/mpc/eddsa_resharing_session.go

@@ -91,7 +91,7 @@ func NewEDDSAReshareSession(
 	}
 }
 
-func (s *eddsaReshareSession) Init() {
+func (s *eddsaReshareSession) Init() error {
 	logger.Infof("Initializing resharing session with partyID: %s, peerIDs %s", s.selfPartyID, s.partyIDs)
 	var share keygen.LocalPartySaveData
 	if s.isNewParty {
@@ -100,13 +100,14 @@ func (s *eddsaReshareSession) Init() {
 	} else {
 		err := s.loadOldShareDataGeneric(s.walletID, s.GetVersion(), &share)
 		if err != nil {
-			s.ErrCh <- err
-			return
+			return fmt.Errorf("failed to load old share data eddsa: %w", err)
 		}
 	}
 	s.party = resharing.NewLocalParty(s.reshareParams, share, s.outCh, s.endCh)
 	logger.Infof("[INITIALIZED] Initialized resharing session successfully partyID: %s, peerIDs %s, walletID %s, oldThreshold = %d, newThreshold = %d",
 		s.selfPartyID, s.partyIDs, s.walletID, s.threshold, s.reshareParams.NewThreshold())
+
+	return nil
 }
 
 func (s *eddsaReshareSession) Reshare(done func()) {

pkg/mpc/session.go

@@ -242,12 +242,18 @@ func (s *session) loadOldShareDataGeneric(walletID string, version int, dest int
 	if version > 0 {
 		key = s.composeKey(walletIDWithVersion(walletID, version))
 		keyData, err = s.kvstore.Get(key)
+		if err != nil {
+			return err
+		}
 	}
 
 	// If version == 0 or previous key not found, fall back to unversioned key
-	if err != nil || version == 0 {
+	if version == 0 {
 		key = s.composeKey(walletID)
 		keyData, err = s.kvstore.Get(key)
+		if err != nil {
+			return err
+		}
 	}
 
 	if err != nil {