Merge pull request #170 from dragonheaven/feature/shuffle_entries_v2

ShuffleEntries for random entries
pegnet · Nov 17, 2020 · cf5c697 · cf5c697
2 parents 13e21cd + a578f6e
commit cf5c697
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/node/node.go b/node/node.go
@@ -68,6 +68,10 @@ var (
 	// These pAssets have got small marketcap, and these will be disabled for conversion.
 	// Estimated to be XXXXXXXX
 	OneWaySmallAssetsConversions uint32 = 999999
+
+	// V202EnhanceActivation indicates the activation of PegNet 2.0.2.
+	// Estimated to be  XXXXX XXX XXX
+	V202EnhanceActivation uint32 = 999999
 )
 
 func SetAllActivations(act uint32) {
@@ -83,6 +87,8 @@ func SetAllActivations(act uint32) {
 	V20HeightActivation = act
 	V20DevRewardsHeightActivation = act
 	OneWaySmallAssetsConversions = act
+	SprSignatureActivation = act
+	V202EnhanceActivation = act
 }
 
 type Pegnetd struct {

diff --git a/node/spr.go b/node/spr.go
@@ -26,6 +26,9 @@ func (d *Pegnetd) GradeS(ctx context.Context, block *factom.EBlock) (graderStake
 	if block.Height >= SprSignatureActivation {
 		ver = 6
 	}
+	if block.Height >= V202EnhanceActivation {
+		ver = 7
+	}
 
 	g, err := graderStake.NewGrader(ver, int32(block.Height))
 	if err != nil {