restrcut

consensus/model/block_chain.go

@@ -3,6 +3,8 @@ package model
 import (
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/core/types"
+	"github.com/Qitmeer/qng/meerdag"
+	"github.com/Qitmeer/qng/params"
 )
 
 type BlockChain interface {
@@ -22,4 +24,7 @@ type BlockChain interface {
 	GetBlockById(id uint) Block
 	FetchBlockByHash(hash *hash.Hash) (*types.SerializedBlock, error)
 	GetBlockOrderByHash(hash *hash.Hash) (uint, error)
+	GetBlockHeader(ib meerdag.IBlock) *types.BlockHeader
+	BlockDAG() *meerdag.MeerDAG
+	ChainParams() *params.Params
 }

consensus/model/meer_dag.go

@@ -0,0 +1,11 @@
+package model
+
+import (
+	"github.com/Qitmeer/qng/common/hash"
+	"github.com/Qitmeer/qng/rpc/api"
+)
+
+type MeerDag interface {
+	RegisterAPIs(apis []api.API)
+	GetBlockIDByTxHash(txhash *hash.Hash) uint64
+}

core/blockchain/validate.go

@@ -10,6 +10,9 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"math"
+	"time"
+
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/consensus/forks"
 	"github.com/Qitmeer/qng/consensus/model"
@@ -22,11 +25,10 @@ import (
 	"github.com/Qitmeer/qng/core/state"
 	"github.com/Qitmeer/qng/core/types"
 	"github.com/Qitmeer/qng/core/types/pow"
+	"github.com/Qitmeer/qng/core/types/pow/difficultymanager"
 	"github.com/Qitmeer/qng/engine/txscript"
 	"github.com/Qitmeer/qng/meerdag"
 	"github.com/Qitmeer/qng/params"
-	"math"
-	"time"
 )
 
 const (
@@ -758,7 +760,7 @@ func (b *BlockChain) checkBlockHeaderContext(block *types.SerializedBlock, prevN
 		// Ensure the difficulty specified in the block header matches
 		// the calculated difficulty based on the previous block and
 		// difficulty retarget rules.
-		expDiff, err := b.calcNextRequiredDifficulty(prevNode,
+		expDiff, err := difficultymanager.NewDiffManager(b).CalcNextRequiredDifficulty(prevNode,
 			header.Timestamp, instance)
 		if err != nil {
 			return err

core/types/pow/config.go

@@ -48,9 +48,11 @@ type PowConfig struct {
 
 	//is init
 	init bool
+
+	DifficultyMode int
 }
 
-//global cache
+// global cache
 func GetPowConfig() *PowConfig {
 	if PowConfigInstance != nil {
 		return PowConfigInstance

core/types/pow/difficultymanager/interface_difficultymanager.go

@@ -0,0 +1,40 @@
+package difficultymanager
+
+import (
+	"time"
+
+	"github.com/Qitmeer/qng/consensus/model"
+	"github.com/Qitmeer/qng/core/types/pow"
+	"github.com/Qitmeer/qng/meerdag"
+)
+
+const (
+	// MEER difficulty adjustment
+	DIFFICULTY_MODE_MEER = iota
+	// KASPAD difficulty adjustment
+	DIFFICULTY_MODE_KASPAD
+)
+
+// DifficultyManager provides a method to resolve the
+// difficulty value of a block
+type DifficultyManager interface {
+	CalcNextRequiredDifficulty(timestamp time.Time, powType pow.PowType) (uint32, error)
+	RequiredDifficulty(block meerdag.IBlock, newBlockTime time.Time, powInstance pow.IPow) (uint32, error)
+}
+
+func NewDiffManager(b model.BlockChain) DifficultyManager {
+	switch b.ChainParams().PowConfig.DifficultyMode {
+	case DIFFICULTY_MODE_KASPAD:
+		return &kaspadDiff{
+			b:                              b,
+			powMax:                         b.ChainParams().PowConfig.MeerXKeccakV1PowLimit,
+			difficultyAdjustmentWindowSize: int(b.ChainParams().WorkDiffWindowSize),
+			disableDifficultyAdjustment:    false,
+			targetTimePerBlock:             b.ChainParams().TargetTimePerBlock,
+			genesisBits:                    b.ChainParams().PowConfig.MeerXKeccakV1PowLimitBits,
+		}
+	}
+	return &meerDiff{
+		b: b,
+	}
+}