fix critical bug in matrix generation

karlsen-network · Jun 28, 2024 · 5dea9c1 · 5dea9c1
1 parent a8405b3
commit 5dea9c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/domain/consensus/utils/pow/pow.go b/domain/consensus/utils/pow/pow.go
@@ -99,7 +99,7 @@ func NewState(header externalapi.MutableBlockHeader, generatedag bool) *State {
 		Target:     *target,
 		prePowHash: *prePowHash,
 		//will remove matrix opow
-		//mat:       *generateMatrix(prePowHash),
+		mat:          *generateMatrix(prePowHash),
 		Timestamp:    timestamp,
 		Nonce:        nonce,
 		context:      *getContext(generatedag, log),
@@ -144,8 +144,10 @@ func (state *State) CalculateProofOfWorkValue() *big.Int {
 	//log.Infof("Hash b3-1: %x", powHash.ByteSlice())
 	finalHash := powHash
 	if state.blockVersion == constants.BlockVersionBeforeHF {
+		log.Infof("Using khashv1 %d %d\n", state.blockVersion, constants.BlockVersionBeforeHF)
 		finalHash = state.mat.HeavyHash(powHash)
 	} else {
+		log.Infof("Using khashv2 %d %d\n", state.blockVersion, constants.BlockVersionBeforeHF)
 		middleHash := fishHashPlus(&state.context, powHash)
 		writer2 := hashes.NewPoWHashWriter()
 		writer2.InfallibleWrite(middleHash.ByteSlice())

diff --git a/domain/dagconfig/params.go b/domain/dagconfig/params.go
@@ -474,6 +474,7 @@ var DevnetParams = Params{
 
 	MaxBlockLevel: 250,
 	MergeDepth:    defaultMergeDepth,
+	HFDAAScore:    50,
 }
 
 // ErrDuplicateNet describes an error where the parameters for a Karlsen