From d9d0b24ea8d94ace97147bb858206ed6c31708b0 Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei@obol.tech>
Date: Thu, 29 Jan 2026 13:12:25 +0300
Subject: [PATCH] dkg: fixing processkey

---
 dkg/pedersen/dkg.go             | 4 ++--
 dkg/protocol_removeoperators.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dkg/pedersen/dkg.go b/dkg/pedersen/dkg.go
index 31803ae87..98674261e 100644
--- a/dkg/pedersen/dkg.go
+++ b/dkg/pedersen/dkg.go
@@ -181,10 +181,10 @@ func processKey(ctx context.Context, config *Config, board *Board, key *kdkg.Dis
 
 	publicShares := make(map[int]tbls.PublicKey)
 
-	for i, oi := range oldShareIndices {
+	for _, oi := range oldShareIndices {
 		var pk tbls.PublicKey
 		copy(pk[:], oldShareRevMap[oi])
-		publicShares[i+1] = pk
+		publicShares[oi] = pk
 	}
 
 	return share.Share{
diff --git a/dkg/protocol_removeoperators.go b/dkg/protocol_removeoperators.go
index da8fbdfd6..a7d7b779e 100644
--- a/dkg/protocol_removeoperators.go
+++ b/dkg/protocol_removeoperators.go
@@ -149,7 +149,7 @@ func (p *removeOperatorsProtocol) PostInit(ctx context.Context, pctx *ProtocolCo
 		nodeIdx := slices.Index(newPeerIDs, pctx.ThisPeerID)
 		pctx.ThisNodeIdx = cluster.NodeIdx{
 			PeerIdx:  nodeIdx,
-			ShareIdx: nodeIdx + 1,
+			ShareIdx: peerMap[pctx.ThisPeerID].ShareIdx,
 		}
 		pctx.SigExchanger = newExchanger(pctx.ThisNode, nodeIdx, newPeerIDs, []sigType{sigLock}, pctx.Config.Timeout)
 	}