ellector.GetExtendedParticipantList to return pubkeys of validators

tonkeeper · Dec 28, 2023 · d8f7e16 · d8f7e16
1 parent 574fa11
commit d8f7e16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/contract/elector/elector.go b/contract/elector/elector.go
@@ -14,6 +14,7 @@ type executor interface {
 }
 
 type Validator struct {
+	Pubkey    tlb.Bits256
 	Stake     int64
 	MaxFactor int64
 	Address   ton.AccountID
@@ -67,6 +68,7 @@ func GetParticipantListExtended(ctx context.Context, electorAddr ton.AccountID,
 		}
 		v.Validator.AdnlAddr.Hex()
 		validators = append(validators, Validator{
+			Pubkey:    v.ID,
 			Stake:     int64(v.Validator.Stake),
 			MaxFactor: int64(v.Validator.MaxFactor),
 			Address:   accountID,

diff --git a/contract/elector/elector_test.go b/contract/elector/elector_test.go
@@ -5,6 +5,7 @@ import (
 	"math"
 	"testing"
 
+	"github.com/tonkeeper/tongo/tlb"
 	"github.com/tonkeeper/tongo/ton"
 	"github.com/tonkeeper/tongo/tvm"
 )
@@ -27,13 +28,18 @@ func TestGetExtendedParticipantList(t *testing.T) {
 	if len(participants.Validators) != 316 {
 		t.Fatalf("got: %v, want: 316", len(participants.Validators))
 	}
+	pubkeys := make(map[tlb.Bits256]struct{})
 	for _, validator := range participants.Validators {
 		if validator.Stake < math.MaxInt32 {
 			t.Fatalf("stake looks too low: %v", validator.Stake)
 		}
 		if validator.MaxFactor != 196608 {
 			t.Fatalf("got: %v, want: 196608", validator.MaxFactor)
 		}
+		if _, ok := pubkeys[validator.Pubkey]; ok {
+			t.Fatalf("two validators have the same pubkey")
+		}
+		pubkeys[validator.Pubkey] = struct{}{}
 	}
 
 }