Skip to content

params: fix V2 compare issue #1926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnilChinchawale merged 1 commit into from
Jan 16, 2026
Merged

params: fix V2 compare issue #1926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 62 additions & 16 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package params
import (
"fmt"
"math/big"
"slices"
"strings"
"sync"

Expand Down Expand Up @@ -568,40 +567,87 @@ type ExpTimeoutConfig struct {

func XDPoSConfigEqual(a, b *XDPoSConfig) bool {
if a == nil || b == nil {
return a == b
if a != b {
log.Warn("[XDPoSConfigEqual] One of the configs is nil", "a", a, "b", b)
return false
}
return true
}
if a.Period != b.Period {
log.Warn("[XDPoSConfigEqual] Period mismatch", "a.Period", a.Period, "b.Period", b.Period)
return false
}
if a.Epoch != b.Epoch {
log.Warn("[XDPoSConfigEqual] Epoch mismatch", "a.Epoch", a.Epoch, "b.Epoch", b.Epoch)
return false
}
if a.Reward != b.Reward {
log.Warn("[XDPoSConfigEqual] Reward mismatch", "a.Reward", a.Reward, "b.Reward", b.Reward)
return false
}
if a.RewardCheckpoint != b.RewardCheckpoint {
log.Warn("[XDPoSConfigEqual] RewardCheckpoint mismatch", "a.RewardCheckpoint", a.RewardCheckpoint, "b.RewardCheckpoint", b.RewardCheckpoint)
return false
}
if a.Gap != b.Gap {
log.Warn("[XDPoSConfigEqual] Gap mismatch", "a.Gap", a.Gap, "b.Gap", b.Gap)
return false
}
if a.FoudationWalletAddr != b.FoudationWalletAddr {
log.Warn("[XDPoSConfigEqual] FoudationWalletAddr mismatch", "a.FoudationWalletAddr", a.FoudationWalletAddr.Hex(), "b.FoudationWalletAddr", b.FoudationWalletAddr.Hex())
return false
}
if a.Period != b.Period || a.Epoch != b.Epoch || a.Reward != b.Reward || a.RewardCheckpoint != b.RewardCheckpoint || a.Gap != b.Gap || a.FoudationWalletAddr != b.FoudationWalletAddr || a.SkipV1Validation != b.SkipV1Validation {
if a.SkipV1Validation != b.SkipV1Validation {
log.Warn("[XDPoSConfigEqual] SkipV1Validation mismatch", "a.SkipV1Validation", a.SkipV1Validation, "b.SkipV1Validation", b.SkipV1Validation)
return false
}
return V2Equal(a.V2, b.V2)
}

func V2Equal(a, b *V2) bool {
if a == nil || b == nil {
return a == b
if a != b {
log.Warn("[V2Equal] One of the configs is nil", "a", a, "b", b)
return false
}
return true
}
if a.SwitchEpoch != b.SwitchEpoch || !configNumEqual(a.SwitchBlock, b.SwitchBlock) || !slices.Equal(a.configIndex, b.configIndex) {
if !configNumEqual(a.SwitchBlock, b.SwitchBlock) {
log.Warn("[V2Equal] SwitchBlock mismatch", "a.SwitchBlock", a.SwitchBlock, "b.SwitchBlock", b.SwitchBlock)
return false
}
// compare AllConfigs according to smaller map
smallerMap, largerMap := a.AllConfigs, b.AllConfigs
if len(smallerMap) > len(largerMap) {
smallerMap, largerMap = largerMap, smallerMap
}
for key, cfg1 := range smallerMap {
cfg2, ok := largerMap[key]
if !ok || !V2ConfigEqual(cfg1, cfg2) {
return false
// Only check configs in both of AllConfigs
for k1, cfg1 := range a.AllConfigs {
if cfg2, ok := b.AllConfigs[k1]; ok {
if !V2ConfigEqual(cfg1, cfg2) {
return false
}
}
Comment on lines +619 to 625

Copilot AI Jan 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The V2Equal function only checks configs that exist in both AllConfigs maps (intersection). This means if one config has additional entries that the other doesn't have, they will still be considered equal. This asymmetric comparison could lead to incorrect equality results. Consider whether configs should be considered equal if they have different sets of keys in AllConfigs.

Suggested change
// Only check configs in both of AllConfigs
for k1, cfg1 := range a.AllConfigs {
if cfg2, ok := b.AllConfigs[k1]; ok {
if !V2ConfigEqual(cfg1, cfg2) {
return false
}
}
// Ensure AllConfigs have the same number of entries
if len(a.AllConfigs) != len(b.AllConfigs) {
log.Warn("[V2Equal] AllConfigs length mismatch", "len(a.AllConfigs)", len(a.AllConfigs), "len(b.AllConfigs)", len(b.AllConfigs))
return false
}
// Ensure every config in a.AllConfigs exists in b.AllConfigs and is equal
for k1, cfg1 := range a.AllConfigs {
cfg2, ok := b.AllConfigs[k1]
if !ok {
log.Warn("[V2Equal] Missing config in b.AllConfigs", "key", k1)
return false
}
if !V2ConfigEqual(cfg1, cfg2) {
return false
}

Copilot uses AI. Check for mistakes.
}
return true
}

func V2ConfigEqual(a, b *V2Config) bool {
if a == nil || b == nil {
return a == b
if a != b {
log.Warn("[V2ConfigEqual] One of the configs is nil", "a", a, "b", b)
return false
}
return true
}
return a.MaxMasternodes == b.MaxMasternodes && a.SwitchRound == b.SwitchRound && a.CertThreshold == b.CertThreshold
if a.MaxMasternodes != b.MaxMasternodes {
log.Warn("[V2ConfigEqual] MaxMasternodes mismatch", "a.MaxMasternodes", a.MaxMasternodes, "b.MaxMasternodes", b.MaxMasternodes)
return false
}
if a.SwitchRound != b.SwitchRound {
log.Warn("[V2ConfigEqual] SwitchRound mismatch", "a.SwitchRound", a.SwitchRound, "b.SwitchRound", b.SwitchRound)
return false
}
if a.CertThreshold != b.CertThreshold {
log.Warn("[V2ConfigEqual] CertThreshold mismatch", "a.CertThreshold", a.CertThreshold, "b.CertThreshold", b.CertThreshold)
return false
}
return true
}
Comment on lines 630 to 651

Copilot AI Jan 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The V2ConfigEqual function is incomplete. It only compares MaxMasternodes, SwitchRound, and CertThreshold, but the V2Config struct has many more fields that should be compared including MaxProtectorNodes, MaxObverserNodes, MinePeriod, TimeoutSyncThreshold, TimeoutPeriod, MasternodeReward, ProtectorReward, ObserverReward, MinimumMinerBlockPerEpoch, LimitPenaltyEpoch, MinimumSigningTx, and ExpTimeoutConfig. This could lead to configurations being considered equal when they are actually different.

Copilot uses AI. Check for mistakes.

func (c *XDPoSConfig) String() string {
Expand Down