hf test go advanced: implement validation for fork config

Author: glyh

src/app/hardfork_test/src/internal/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"math"
 	"os"
 	"time"
 )
@@ -143,6 +144,11 @@ func (c *Config) Validate() error {
 
 	return nil
 }
+func (c *Config) HfSlotDelta() int {
+
+	forkDelayDuration := time.Duration(c.ForkDelay) * time.Minute
+	return int(math.Ceil(forkDelayDuration.Seconds() / float64(c.MainSlot)))
+}
 
 // FormatTimestamp formats a UNIX timestamp into the format used by the shell script
 func FormatTimestamp(unixTs int64) string {

src/app/hardfork_test/src/internal/hardfork/config_validation.go

@@ -174,7 +174,7 @@ type LegacyPostpatchForkConfigView struct {
 	} `json:"ledger"`
 }
 
-func (t *HardforkTest) ValidateLegacyPostpatchForkConfig(latestNonEmptyBlock client.BlockData, forkConfigBytes []byte, forkGenesisTs, mainGenesisTs int64) error {
+func (t *HardforkTest) ValidateFinalForkConfig(latestNonEmptyBlock client.BlockData, forkConfigBytes []byte, forkGenesisTs, mainGenesisTs int64) error {
 
 	t.Logger.Info("Validating legacy postpatch fork config")
 	// Calculate expected genesis slot

src/app/hardfork_test/src/internal/hardfork/network.go

@@ -2,7 +2,6 @@ package hardfork
 
 import (
 	"fmt"
-	"math"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -105,9 +104,7 @@ func (t *HardforkTest) RunMainNetwork(mainGenesisTs int64) (*exec.Cmd, error) {
 
 	switch t.Config.ForkMethod {
 	case config.Advanced:
-		forkDelay := time.Duration(t.Config.ForkDelay) * time.Minute
-		hardforkGenesisDelta := int(math.Ceil(forkDelay.Seconds() / float64(t.Config.MainSlot)))
-		args = append(args, "--hardfork-genesis-slot-delta", strconv.Itoa(hardforkGenesisDelta))
+		args = append(args, "--hardfork-genesis-slot-delta", strconv.Itoa(t.Config.HfSlotDelta()))
 	case config.Legacy:
 		// Do nothing as we'll patch the slot at the end of main network
 	}

src/app/hardfork_test/src/internal/hardfork/phases.go

@@ -1,7 +1,6 @@
 package hardfork
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"time"
@@ -153,7 +152,7 @@ func (t *HardforkTest) LegacyForkPhase(analysis *BlockAnalysisResult, forkConfig
 	if err != nil {
 		return nil, err
 	}
-	err = t.ValidateLegacyPostpatchForkConfig(analysis.LatestNonEmptyBlock, patchedConfigBytes, forkGenesisTs, mainGenesisTs)
+	err = t.ValidateFinalForkConfig(analysis.LatestNonEmptyBlock, patchedConfigBytes, forkGenesisTs, mainGenesisTs)
 	if err != nil {
 		return nil, err
 	}
@@ -163,7 +162,7 @@ func (t *HardforkTest) LegacyForkPhase(analysis *BlockAnalysisResult, forkConfig
 }
 
 // Uses `mina advanced generate-hardfork-config CLI`
-func (t *HardforkTest) AdvancedForkPhase(analysis *BlockAnalysisResult) (*ForkData, error) {
+func (t *HardforkTest) AdvancedForkPhase(analysis *BlockAnalysisResult, mainGenesisTs int64) (*ForkData, error) {
 
 	cwd := ""
 	var err error = nil
@@ -177,21 +176,21 @@ func (t *HardforkTest) AdvancedForkPhase(analysis *BlockAnalysisResult) (*ForkDa
 		return nil, err
 	}
 
-	configToPatch := fmt.Sprintf("%s/daemon.json", forkDataPath)
+	forkConfig := fmt.Sprintf("%s/daemon.json", forkDataPath)
 
-	configJsonString, err := os.ReadFile(configToPatch)
+	forkConfigBytes, err := os.ReadFile(forkConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	// TODO: validate fork config here instead of using a generic map to read it.
-	var configRaw map[string]map[string]string
-	json.Unmarshal(configJsonString, &configRaw)
+	forkGenesisSlot := t.Config.SlotChainEnd + t.Config.HfSlotDelta()
+	forkGenesisTs := mainGenesisTs + int64(forkGenesisSlot*t.Config.MainSlot)
 
-	forkGenesisTs, err := time.Parse(time.RFC3339Nano, configRaw["genesis"]["genesis_state_timestamp"])
+	err = t.ValidateFinalForkConfig(analysis.LatestNonEmptyBlock, forkConfigBytes, forkGenesisTs, mainGenesisTs)
 	if err != nil {
 		return nil, err
 	}
+
 	forkLedgersDir := fmt.Sprintf("%s/genesis", forkDataPath)
-	return &ForkData{config: configToPatch, ledgersDir: forkLedgersDir, genesis: forkGenesisTs.Unix()}, nil
+	return &ForkData{config: forkConfig, ledgersDir: forkLedgersDir, genesis: forkGenesisTs}, nil
 }

src/app/hardfork_test/src/internal/hardfork/test.go

@@ -147,7 +147,7 @@ func (t *HardforkTest) Run() error {
 		beforeShutdown = func(t *HardforkTest, analysis *BlockAnalysisResult) error {
 			t.Logger.Info("Phase 2: Forking with `mina advanced generate-hardfork-config`...")
 
-			forkData, err := t.AdvancedForkPhase(analysis)
+			forkData, err := t.AdvancedForkPhase(analysis, mainGenesisTs)
 			if err != nil {
 				return err
 			}