Add cache to BuildPruningPointProof

A temporary workaround for nodes having trouble to sync (currently the download of pruning point related data during IBD takes more than 30 seconds)

app/app.go

@@ -20,10 +20,7 @@ import (
 	"github.com/kaspanet/kaspad/version"
 )
 
-const (
-	leveldbCacheSizeMiB = 256
-	defaultDataDirname  = "datadir"
-)
+const leveldbCacheSizeMiB = 256
 
 var desiredLimits = &limits.DesiredLimits{
 	FileLimitWant: 2048,
@@ -162,7 +159,7 @@ func (app *kaspadApp) main(startedChan chan<- struct{}) error {
 
 // dbPath returns the path to the block database given a database type.
 func databasePath(cfg *config.Config) string {
-	return filepath.Join(cfg.AppDir, defaultDataDirname)
+	return filepath.Join(cfg.AppDir, "data")
 }
 
 func removeDatabase(cfg *config.Config) error {

app/appmessage/protocol.go

@@ -12,7 +12,7 @@ import (
 
 const (
 	// ProtocolVersion is the latest protocol version this package supports.
-	ProtocolVersion uint32 = 2
+	ProtocolVersion uint32 = 1
 
 	// DefaultServices describes the default services that are supported by
 	// the server.

app/protocol/flows/blockrelay/handle_pruning_point_and_its_anticone_requests.go

@@ -3,12 +3,8 @@ package blockrelay
 import (
 	"github.com/kaspanet/kaspad/app/appmessage"
 	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"runtime"
-	"sync/atomic"
 )
 
 // PruningPointAndItsAnticoneRequestsContext is the interface for the context needed for the HandlePruningPointAndItsAnticoneRequests flow.
@@ -16,80 +12,51 @@ type PruningPointAndItsAnticoneRequestsContext interface {
 	Domain() domain.Domain
 }
 
-var isBusy uint32
-
 // HandlePruningPointAndItsAnticoneRequests listens to appmessage.MsgRequestPruningPointAndItsAnticone messages and sends
 // the pruning point and its anticone to the requesting peer.
 func HandlePruningPointAndItsAnticoneRequests(context PruningPointAndItsAnticoneRequestsContext, incomingRoute *router.Route,
 	outgoingRoute *router.Route, peer *peerpkg.Peer) error {
 
 	for {
-		err := func() error {
-			_, err := incomingRoute.Dequeue()
-			if err != nil {
-				return err
-			}
-
-			if !atomic.CompareAndSwapUint32(&isBusy, 0, 1) {
-				return protocolerrors.Errorf(false, "node is busy with other pruning point anticone requests")
-			}
-			defer atomic.StoreUint32(&isBusy, 0)
-
-			log.Debugf("Got request for pruning point and its anticone from %s", peer)
-
-			pruningPointHeaders, err := context.Domain().Consensus().PruningPointHeaders()
-			if err != nil {
-				return err
-			}
-
-			msgPruningPointHeaders := make([]*appmessage.MsgBlockHeader, len(pruningPointHeaders))
-			for i, header := range pruningPointHeaders {
-				msgPruningPointHeaders[i] = appmessage.DomainBlockHeaderToBlockHeader(header)
-			}
-
-			err = outgoingRoute.Enqueue(appmessage.NewMsgPruningPoints(msgPruningPointHeaders))
-			if err != nil {
-				return err
-			}
-
-			pointAndItsAnticone, err := context.Domain().Consensus().PruningPointAndItsAnticone()
-			if err != nil {
-				return err
-			}
-
-			for _, blockHash := range pointAndItsAnticone {
-				err := sendBlockWithTrustedData(context, outgoingRoute, blockHash)
-				if err != nil {
-					return err
-				}
-			}
-
-			err = outgoingRoute.Enqueue(appmessage.NewMsgDoneBlocksWithTrustedData())
-			if err != nil {
-				return err
-			}
-
-			log.Debugf("Sent pruning point and its anticone to %s", peer)
-			return nil
-		}()
+		_, err := incomingRoute.Dequeue()
 		if err != nil {
 			return err
 		}
+
+		log.Debugf("Got request for pruning point and its anticone from %s", peer)
+
+		pruningPointHeaders, err := context.Domain().Consensus().PruningPointHeaders()
+		if err != nil {
+			return err
+		}
+
+		msgPruningPointHeaders := make([]*appmessage.MsgBlockHeader, len(pruningPointHeaders))
+		for i, header := range pruningPointHeaders {
+			msgPruningPointHeaders[i] = appmessage.DomainBlockHeaderToBlockHeader(header)
+		}
+
+		err = outgoingRoute.Enqueue(appmessage.NewMsgPruningPoints(msgPruningPointHeaders))
+		if err != nil {
+			return err
+		}
+
+		blocks, err := context.Domain().Consensus().PruningPointAndItsAnticoneWithTrustedData()
+		if err != nil {
+			return err
+		}
+
+		for _, block := range blocks {
+			err = outgoingRoute.Enqueue(appmessage.DomainBlockWithTrustedDataToBlockWithTrustedData(block))
+			if err != nil {
+				return err
+			}
+		}
+
+		err = outgoingRoute.Enqueue(appmessage.NewMsgDoneBlocksWithTrustedData())
+		if err != nil {
+			return err
+		}
+
+		log.Debugf("Sent pruning point and its anticone to %s", peer)
 	}
 }
-
-func sendBlockWithTrustedData(context PruningPointAndItsAnticoneRequestsContext, outgoingRoute *router.Route, blockHash *externalapi.DomainHash) error {
-	blockWithTrustedData, err := context.Domain().Consensus().BlockWithTrustedData(blockHash)
-	if err != nil {
-		return err
-	}
-
-	err = outgoingRoute.Enqueue(appmessage.DomainBlockWithTrustedDataToBlockWithTrustedData(blockWithTrustedData))
-	if err != nil {
-		return err
-	}
-
-	runtime.GC()
-
-	return nil
-}

app/protocol/flows/blockrelay/handle_request_pruning_point_utxo_set.go

@@ -70,8 +70,7 @@ func (flow *handleRequestPruningPointUTXOSetFlow) waitForRequestPruningPointUTXO
 	}
 	msgRequestPruningPointUTXOSet, ok := message.(*appmessage.MsgRequestPruningPointUTXOSet)
 	if !ok {
-		// TODO: Change to shouldBan: true once we fix the bug of getting redundant messages
-		return nil, protocolerrors.Errorf(false, "received unexpected message type. "+
+		return nil, protocolerrors.Errorf(true, "received unexpected message type. "+
 			"expected: %s, got: %s", appmessage.CmdRequestPruningPointUTXOSet, message.Command())
 	}
 	return msgRequestPruningPointUTXOSet, nil
@@ -124,8 +123,7 @@ func (flow *handleRequestPruningPointUTXOSetFlow) sendPruningPointUTXOSet(
 			}
 			_, ok := message.(*appmessage.MsgRequestNextPruningPointUTXOSetChunk)
 			if !ok {
-				// TODO: Change to shouldBan: true once we fix the bug of getting redundant messages
-				return protocolerrors.Errorf(false, "received unexpected message type. "+
+				return protocolerrors.Errorf(true, "received unexpected message type. "+
 					"expected: %s, got: %s", appmessage.CmdRequestNextPruningPointUTXOSetChunk, message.Command())
 			}
 

app/protocol/protocol.go

@@ -102,7 +102,7 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 
 func (m *Manager) handleError(err error, netConnection *netadapter.NetConnection, outgoingRoute *routerpkg.Route) {
 	if protocolErr := (protocolerrors.ProtocolError{}); errors.As(err, &protocolErr) {
-		if m.context.Config().EnableBanning && protocolErr.ShouldBan {
+		if !m.context.Config().DisableBanning && protocolErr.ShouldBan {
 			log.Warnf("Banning %s (reason: %s)", netConnection, protocolErr.Cause)
 
 			err := m.context.ConnectionManager().Ban(netConnection)

build_and_test.sh

@@ -15,6 +15,8 @@ golint -set_exit_status ./...
 
 staticcheck -checks SA4006,SA4008,SA4009,SA4010,SA5003,SA1004,SA1014,SA1021,SA1023,SA1024,SA1025,SA1026,SA1027,SA1028,SA2000,SA2001,SA2003,SA4000,SA4001,SA4003,SA4004,SA4011,SA4012,SA4013,SA4014,SA4015,SA4016,SA4017,SA4018,SA4019,SA4020,SA4021,SA4022,SA4023,SA5000,SA5002,SA5004,SA5005,SA5007,SA5008,SA5009,SA5010,SA5011,SA5012,SA6001,SA6002,SA9001,SA9002,SA9003,SA9004,SA9005,SA9006,ST1019 ./...
 
+go vet -composites=false $FLAGS ./...
+
 go build $FLAGS -o kaspad .
 
 if [ -n "${NO_PARALLEL}" ]

cmd/kaspawallet/keys/create.go

@@ -97,7 +97,7 @@ func encryptMnemonic(mnemonic string, password []byte) (*EncryptedMnemonic, erro
 		return nil, err
 	}
 
-	aead, err := getAEAD(defaultNumThreads, password, salt)
+	aead, err := getAEAD(password, salt)
 	if err != nil {
 		return nil, err
 	}

cmd/kaspawallet/keys/keys.go

@@ -23,7 +23,6 @@ var (
 	defaultAppDir = util.AppDir("kaspawallet", false)
 )
 
-// LastVersion is the most up to date file format version
 const LastVersion = 1
 
 func defaultKeysFile(netParams *dagconfig.Params) string {
@@ -37,7 +36,7 @@ type encryptedPrivateKeyJSON struct {
 
 type keysFileJSON struct {
 	Version               uint32                     `json:"version"`
-	NumThreads            uint8                      `json:"numThreads,omitempty"` // This field is ignored for versions different from 0. See more details at the function `numThreads`.
+	NumThreads            uint8                      `json:"numThreads,omitempty"` // This field is ignored for versions different than 0
 	EncryptedPrivateKeys  []*encryptedPrivateKeyJSON `json:"encryptedMnemonics"`
 	ExtendedPublicKeys    []string                   `json:"publicKeys"`
 	MinimumSignatures     uint32                     `json:"minimumSignatures"`
@@ -300,18 +299,9 @@ func (d *File) Save() error {
 	return nil
 }
 
-const defaultNumThreads = 8
-
 func (d *File) numThreads(password []byte) (uint8, error) {
-	// There's a bug in v0 wallets where the number of threads
-	// was determined by the number of logical CPUs at the machine,
-	// which made the authentication non-deterministic across platforms.
-	// In order to solve it we introduce v1 where the number of threads
-	// is constant, and brute force the number of threads in v0. After we
-	// find the right amount via brute force we save the result to the file.
-
 	if d.Version != 0 {
-		return defaultNumThreads, nil
+		return 8, nil
 	}
 
 	if d.NumThreads != 0 {
@@ -351,7 +341,7 @@ func (d *File) detectNumThreads(password, salt []byte) (uint8, error) {
 		_, err := getAEAD(i, password, salt)
 		if err != nil {
 			const maxTries = 32
-			if i > maxTries || !strings.Contains(err.Error(), "message authentication failed") {
+			if i == maxTries || !strings.Contains(err.Error(), "message authentication failed") {
 				return 0, err
 			}
 		} else {

domain/consensus/consensus.go

@@ -137,18 +137,11 @@ func (s *consensus) Init(skipAddingGenesis bool) error {
 	return nil
 }
 
-func (s *consensus) PruningPointAndItsAnticone() ([]*externalapi.DomainHash, error) {
+func (s *consensus) PruningPointAndItsAnticoneWithTrustedData() ([]*externalapi.BlockWithTrustedData, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	return s.pruningManager.PruningPointAndItsAnticone()
-}
-
-func (s *consensus) BlockWithTrustedData(blockHash *externalapi.DomainHash) (*externalapi.BlockWithTrustedData, error) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	return s.pruningManager.BlockWithTrustedData(model.NewStagingArea(), blockHash)
+	return s.pruningManager.PruningPointAndItsAnticoneWithTrustedData()
 }
 
 // BuildBlock builds a block over the current state, with the transactions

domain/consensus/factory.go

@@ -159,7 +159,7 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas
 	dagTraversalManager := dagTraversalManagers[0]
 
 	// Processes
-	parentsManager := parentssanager.New(config.GenesisHash)
+	parentsManager := parentssanager.New(config.GenesisHash, config.HardForkOmitGenesisFromParentsDAAScore)
 	blockParentBuilder := blockparentbuilder.New(
 		dbManager,
 		blockHeaderStore,
@@ -168,6 +168,7 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas
 		reachabilityDataStore,
 		pruningStore,
 
+		config.HardForkOmitGenesisFromParentsDAAScore,
 		config.GenesisHash,
 	)
 	pastMedianTimeManager := f.pastMedianTimeConsructor(

domain/consensus/finality_test.go

@@ -16,8 +16,8 @@ import (
 
 func TestFinality(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		// Set finalityInterval to 20 blocks, so that test runs quickly
-		consensusConfig.FinalityDuration = 20 * consensusConfig.TargetTimePerBlock
+		// Set finalityInterval to 50 blocks, so that test runs quickly
+		consensusConfig.FinalityDuration = 50 * consensusConfig.TargetTimePerBlock
 
 		factory := consensus.NewFactory()
 		consensus, teardown, err := factory.NewTestConsensus(consensusConfig, "TestFinality")
@@ -180,8 +180,7 @@ func TestFinality(t *testing.T) {
 func TestBoundedMergeDepth(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 		// Set finalityInterval to 50 blocks, so that test runs quickly
-		consensusConfig.K = 5
-		consensusConfig.FinalityDuration = 7 * consensusConfig.TargetTimePerBlock
+		consensusConfig.FinalityDuration = 50 * consensusConfig.TargetTimePerBlock
 		finalityInterval := int(consensusConfig.FinalityDepth())
 
 		if int(consensusConfig.K) >= finalityInterval {

domain/consensus/model/externalapi/consensus.go

@@ -25,8 +25,7 @@ type Consensus interface {
 	GetVirtualUTXOs(expectedVirtualParents []*DomainHash, fromOutpoint *DomainOutpoint, limit int) ([]*OutpointAndUTXOEntryPair, error)
 	PruningPoint() (*DomainHash, error)
 	PruningPointHeaders() ([]BlockHeader, error)
-	PruningPointAndItsAnticone() ([]*DomainHash, error)
-	BlockWithTrustedData(blockHash *DomainHash) (*BlockWithTrustedData, error)
+	PruningPointAndItsAnticoneWithTrustedData() ([]*BlockWithTrustedData, error)
 	ClearImportedPruningPointData() error
 	AppendImportedPruningPointUTXOs(outpointAndUTXOEntryPairs []*OutpointAndUTXOEntryPair) error
 	ValidateAndInsertImportedPruningPoint(newPruningPoint *DomainHash) error

domain/consensus/model/interface_processes_parentsmanager.go

@@ -2,7 +2,6 @@ package model
 
 import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 
-// ParentsManager lets is a wrapper above header parents that replaces empty parents with genesis when needed.
 type ParentsManager interface {
 	ParentsAtLevel(blockHeader externalapi.BlockHeader, level int) externalapi.BlockLevelParents
 	Parents(blockHeader externalapi.BlockHeader) []externalapi.BlockLevelParents

domain/consensus/model/interface_processes_pruningmanager.go

@@ -12,7 +12,6 @@ type PruningManager interface {
 	AppendImportedPruningPointUTXOs(outpointAndUTXOEntryPairs []*externalapi.OutpointAndUTXOEntryPair) error
 	UpdatePruningPointIfRequired() error
 	PruneAllBlocksBelow(stagingArea *StagingArea, pruningPointHash *externalapi.DomainHash) error
-	PruningPointAndItsAnticone() ([]*externalapi.DomainHash, error)
+	PruningPointAndItsAnticoneWithTrustedData() ([]*externalapi.BlockWithTrustedData, error)
 	ExpectedHeaderPruningPoint(stagingArea *StagingArea, blockHash *externalapi.DomainHash) (*externalapi.DomainHash, error)
-	BlockWithTrustedData(stagingArea *StagingArea, blockHash *externalapi.DomainHash) (*externalapi.BlockWithTrustedData, error)
 }

domain/consensus/processes/blockparentbuilder/blockparentbuilder.go

@@ -16,7 +16,8 @@ type blockParentBuilder struct {
 	reachabilityDataStore model.ReachabilityDataStore
 	pruningStore          model.PruningStore
 
-	genesisHash *externalapi.DomainHash
+	hardForkOmitGenesisFromParentsDAAScore uint64
+	genesisHash                            *externalapi.DomainHash
 }
 
 // New creates a new instance of a BlockParentBuilder
@@ -29,6 +30,7 @@ func New(
 	reachabilityDataStore model.ReachabilityDataStore,
 	pruningStore model.PruningStore,
 
+	hardForkOmitGenesisFromParentsDAAScore uint64,
 	genesisHash *externalapi.DomainHash,
 ) model.BlockParentBuilder {
 	return &blockParentBuilder{
@@ -37,9 +39,10 @@ func New(
 		dagTopologyManager: dagTopologyManager,
 		parentsManager:     parentsManager,
 
-		reachabilityDataStore: reachabilityDataStore,
-		pruningStore:          pruningStore,
-		genesisHash:           genesisHash,
+		reachabilityDataStore:                  reachabilityDataStore,
+		pruningStore:                           pruningStore,
+		hardForkOmitGenesisFromParentsDAAScore: hardForkOmitGenesisFromParentsDAAScore,
+		genesisHash:                            genesisHash,
 	}
 }
 
@@ -212,12 +215,10 @@ func (bpb *blockParentBuilder) BuildParents(stagingArea *model.StagingArea,
 		}
 	}
 
-	parents := make([]externalapi.BlockLevelParents, 0, len(candidatesByLevelToReferenceBlocksMap))
+	parents := make([]externalapi.BlockLevelParents, len(candidatesByLevelToReferenceBlocksMap))
 	for blockLevel := 0; blockLevel < len(candidatesByLevelToReferenceBlocksMap); blockLevel++ {
-		if blockLevel > 0 {
-			if _, ok := candidatesByLevelToReferenceBlocksMap[blockLevel][*bpb.genesisHash]; ok && len(candidatesByLevelToReferenceBlocksMap[blockLevel]) == 1 {
-				break
-			}
+		if _, ok := candidatesByLevelToReferenceBlocksMap[blockLevel][*bpb.genesisHash]; daaScore >= bpb.hardForkOmitGenesisFromParentsDAAScore && ok && len(candidatesByLevelToReferenceBlocksMap[blockLevel]) == 1 {
+			break
 		}
 
 		levelBlocks := make(externalapi.BlockLevelParents, 0, len(candidatesByLevelToReferenceBlocksMap[blockLevel]))
@@ -226,7 +227,7 @@ func (bpb *blockParentBuilder) BuildParents(stagingArea *model.StagingArea,
 			levelBlocks = append(levelBlocks, &block)
 		}
 
-		parents = append(parents, levelBlocks)
+		parents[blockLevel] = levelBlocks
 	}
 	return parents, nil
 }

domain/consensus/processes/blockprocessor/validate_and_insert_block.go

@@ -1,20 +1,12 @@
 package blockprocessor
 
 import (
-	"bytes"
-	"compress/gzip"
-	"github.com/kaspanet/go-muhash"
-
-	// we need to embed the utxoset of mainnet genesis here
-	_ "embed"
 	"fmt"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/multiset"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 	"github.com/kaspanet/kaspad/infrastructure/db/database"
-	"github.com/kaspanet/kaspad/util/difficulty"
+
 	"github.com/kaspanet/kaspad/util/staging"
-	"io"
-	"sync"
+
+	"github.com/kaspanet/kaspad/util/difficulty"
 
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
@@ -24,9 +16,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-//go:embed resources/utxos.gz
-var utxoDumpFile []byte
-
 func (bp *blockProcessor) setBlockStatusAfterBlockValidation(
 	stagingArea *model.StagingArea, block *externalapi.DomainBlock, isPruningPoint bool) error {
 
@@ -139,11 +128,6 @@ func (bp *blockProcessor) validateAndInsertBlock(stagingArea *model.StagingArea,
 		}
 	}
 
-	err = bp.ifGenesisSetUtxoSet(block)
-	if err != nil {
-		return nil, err
-	}
-
 	var selectedParentChainChanges *externalapi.SelectedChainPath
 	var virtualUTXODiff externalapi.UTXODiff
 	var reversalData *model.UTXODiffReversalData
@@ -231,93 +215,6 @@ func (bp *blockProcessor) validateAndInsertBlock(stagingArea *model.StagingArea,
 	}, nil
 }
 
-var mainnetGenesisUTXOSet externalapi.UTXODiff
-var mainnetGenesisMultiSet model.Multiset
-var mainnetGenesisOnce sync.Once
-var mainnetGenesisErr error
-
-func deserializeMainnetUTXOSet() (externalapi.UTXODiff, model.Multiset, error) {
-	mainnetGenesisOnce.Do(func() {
-		toAdd := make(map[externalapi.DomainOutpoint]externalapi.UTXOEntry)
-		mainnetGenesisMultiSet = multiset.New()
-		file, err := gzip.NewReader(bytes.NewReader(utxoDumpFile))
-		if err != nil {
-			mainnetGenesisErr = err
-			return
-		}
-		for i := 0; ; i++ {
-			size := make([]byte, 1)
-			_, err = io.ReadFull(file, size)
-			if errors.Is(err, io.EOF) {
-				break
-			}
-			if err != nil {
-				mainnetGenesisErr = err
-				return
-			}
-
-			serializedUTXO := make([]byte, size[0])
-			_, err = io.ReadFull(file, serializedUTXO)
-			if err != nil {
-				mainnetGenesisErr = err
-				return
-			}
-
-			mainnetGenesisMultiSet.Add(serializedUTXO)
-
-			entry, outpoint, err := utxo.DeserializeUTXO(serializedUTXO)
-			if err != nil {
-				mainnetGenesisErr = err
-				return
-			}
-			toAdd[*outpoint] = entry
-		}
-		mainnetGenesisUTXOSet, mainnetGenesisErr = utxo.NewUTXODiffFromCollections(utxo.NewUTXOCollection(toAdd), utxo.NewUTXOCollection(make(map[externalapi.DomainOutpoint]externalapi.UTXOEntry)))
-	})
-	return mainnetGenesisUTXOSet, mainnetGenesisMultiSet, mainnetGenesisErr
-}
-
-func (bp *blockProcessor) ifGenesisSetUtxoSet(block *externalapi.DomainBlock) error {
-	isGenesis := len(block.Header.DirectParents()) == 0
-	if !isGenesis {
-		return nil
-	}
-	blockHash := consensushashing.BlockHash(block)
-	if !block.Header.UTXOCommitment().Equal(externalapi.NewDomainHashFromByteArray(muhash.EmptyMuHashHash.AsArray())) {
-		log.Infof("Loading checkpoint UTXO set")
-		diff, utxoSetMultiset, err := deserializeMainnetUTXOSet()
-		if err != nil {
-			return err
-		}
-		log.Infof("Finished loading checkpoint UTXO set")
-		utxoSetHash := utxoSetMultiset.Hash()
-		if !utxoSetHash.Equal(block.Header.UTXOCommitment()) {
-			return errors.New("Invalid UTXO set dump")
-		}
-
-		area := model.NewStagingArea()
-		bp.consensusStateStore.StageVirtualUTXODiff(area, diff)
-		bp.utxoDiffStore.Stage(area, blockHash, diff, nil)
-		// commit the multiset of genesis
-		bp.multisetStore.Stage(area, blockHash, utxoSetMultiset)
-		err = staging.CommitAllChanges(bp.databaseContext, area)
-		if err != nil {
-			return err
-		}
-	} else {
-		// if it's genesis but has an empty muhash then commit an empty multiset and an empty diff
-		area := model.NewStagingArea()
-		bp.consensusStateStore.StageVirtualUTXODiff(area, utxo.NewUTXODiff())
-		bp.utxoDiffStore.Stage(area, blockHash, utxo.NewUTXODiff(), nil)
-		bp.multisetStore.Stage(area, blockHash, multiset.New())
-		err := staging.CommitAllChanges(bp.databaseContext, area)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func isHeaderOnlyBlock(block *externalapi.DomainBlock) bool {
 	return len(block.Transactions) == 0
 }

domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go

@@ -87,18 +87,13 @@ func TestValidateAndInsertImportedPruningPoint(t *testing.T) {
 				t.Fatalf("PruningPointHeaders: %+v", err)
 			}
 
-			pruningPointAndItsAnticone, err := tcSyncer.PruningPointAndItsAnticone()
+			pruningPointAndItsAnticoneWithTrustedData, err := tcSyncer.PruningPointAndItsAnticoneWithTrustedData()
 			if err != nil {
-				t.Fatalf("PruningPointAndItsAnticone: %+v", err)
+				t.Fatalf("PruningPointAndItsAnticoneWithTrustedData: %+v", err)
 			}
 
-			for _, blockHash := range pruningPointAndItsAnticone {
-				blockWithTrustedData, err := tcSyncer.BlockWithTrustedData(blockHash)
-				if err != nil {
-					return
-				}
-
-				_, err = synceeStaging.ValidateAndInsertBlockWithTrustedData(blockWithTrustedData, false)
+			for _, blockWithTrustedData := range pruningPointAndItsAnticoneWithTrustedData {
+				_, err := synceeStaging.ValidateAndInsertBlockWithTrustedData(blockWithTrustedData, false)
 				if err != nil {
 					t.Fatalf("ValidateAndInsertBlockWithTrustedData: %+v", err)
 				}
@@ -140,21 +135,10 @@ func TestValidateAndInsertImportedPruningPoint(t *testing.T) {
 				}
 			}
 
-			var fromOutpoint *externalapi.DomainOutpoint
-			var pruningPointUTXOs []*externalapi.OutpointAndUTXOEntryPair
-			const step = 100_000
-			for {
-				outpointAndUTXOEntryPairs, err := tcSyncer.GetPruningPointUTXOs(pruningPoint, fromOutpoint, step)
-				if err != nil {
-					t.Fatalf("GetPruningPointUTXOs: %+v", err)
-				}
-				fromOutpoint = outpointAndUTXOEntryPairs[len(outpointAndUTXOEntryPairs)-1].Outpoint
-				pruningPointUTXOs = append(pruningPointUTXOs, outpointAndUTXOEntryPairs...)
-				if len(outpointAndUTXOEntryPairs) < step {
-					break
-				}
+			pruningPointUTXOs, err := tcSyncer.GetPruningPointUTXOs(pruningPoint, nil, 1000)
+			if err != nil {
+				t.Fatalf("GetPruningPointUTXOs: %+v", err)
 			}
-
 			err = synceeStaging.AppendImportedPruningPointUTXOs(pruningPointUTXOs)
 			if err != nil {
 				t.Fatalf("AppendImportedPruningPointUTXOs: %+v", err)
@@ -518,7 +502,7 @@ func TestGetPruningPointUTXOs(t *testing.T) {
 
 		// Get pruning point UTXOs in a loop
 		var allOutpointAndUTXOEntryPairs []*externalapi.OutpointAndUTXOEntryPair
-		const step = 100_000
+		step := 100
 		var fromOutpoint *externalapi.DomainOutpoint
 		for {
 			outpointAndUTXOEntryPairs, err := testConsensus.GetPruningPointUTXOs(pruningPoint, fromOutpoint, step)
@@ -533,17 +517,11 @@ func TestGetPruningPointUTXOs(t *testing.T) {
 			}
 		}
 
-		const mainnetUTXOSize = 1232643
-		expected := len(outputs) + 1
-		if consensusConfig.Name == "kaspa-mainnet" {
-			expected += mainnetUTXOSize
-		}
-
 		// Make sure the length of the UTXOs is exactly spendingTransaction.Outputs + 1 coinbase
 		// output (includingBlock's coinbase)
-		if len(allOutpointAndUTXOEntryPairs) != expected {
+		if len(allOutpointAndUTXOEntryPairs) != len(outputs)+1 {
 			t.Fatalf("Returned an unexpected amount of UTXOs. "+
-				"Want: %d, got: %d", expected, len(allOutpointAndUTXOEntryPairs))
+				"Want: %d, got: %d", len(outputs)+2, len(allOutpointAndUTXOEntryPairs))
 		}
 
 		// Make sure all spendingTransaction.Outputs are in the returned UTXOs

domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"math"
 	"math/big"
-	"reflect"
-	"runtime"
 	"testing"
 
 	"github.com/kaspanet/kaspad/domain/consensus"
@@ -23,31 +21,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-func TestBlockValidator_ValidateBodyInIsolation(t *testing.T) {
-	tests := []func(t *testing.T, tc testapi.TestConsensus, cfg *consensus.Config){
-		CheckBlockSanity,
-		CheckBlockHashMerkleRoot,
-		BlockMass,
-		CheckBlockDuplicateTransactions,
-		CheckBlockContainsOnlyOneCoinbase,
-		CheckBlockDoubleSpends,
-		CheckFirstBlockTransactionIsCoinbase,
-	}
-	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		tc, teardown, err := consensus.NewFactory().NewTestConsensus(consensusConfig, "TestChainedTransactions")
-		if err != nil {
-			t.Fatalf("Error setting up consensus: %+v", err)
-		}
-		defer teardown(false)
-		for _, test := range tests {
-			testName := runtime.FuncForPC(reflect.ValueOf(test).Pointer()).Name()
-			t.Run(testName, func(t *testing.T) {
-				test(t, tc, consensusConfig)
-			})
-		}
-	})
-}
-
 func TestChainedTransactions(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 		consensusConfig.BlockCoinbaseMaturity = 0
@@ -116,39 +89,47 @@ func TestChainedTransactions(t *testing.T) {
 	})
 }
 
-// CheckBlockSanity tests the CheckBlockSanity function to ensure it works
+// TestCheckBlockSanity tests the CheckBlockSanity function to ensure it works
 // as expected.
-func CheckBlockSanity(t *testing.T, tc testapi.TestConsensus, _ *consensus.Config) {
-	blockHash := consensushashing.BlockHash(&exampleValidBlock)
-	if len(exampleValidBlock.Transactions) < 3 {
-		t.Fatalf("Too few transactions in block, expect at least 3, got %v", len(exampleValidBlock.Transactions))
-	}
+func TestCheckBlockSanity(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockSanity")
+		if err != nil {
+			t.Fatalf("Error setting up consensus: %+v", err)
+		}
+		defer teardown(false)
+		blockHash := consensushashing.BlockHash(&exampleValidBlock)
+		if len(exampleValidBlock.Transactions) < 3 {
+			t.Fatalf("Too few transactions in block, expect at least 3, got %v", len(exampleValidBlock.Transactions))
+		}
 
-	stagingArea := model.NewStagingArea()
+		stagingArea := model.NewStagingArea()
 
-	tc.BlockStore().Stage(stagingArea, blockHash, &exampleValidBlock)
+		tc.BlockStore().Stage(stagingArea, blockHash, &exampleValidBlock)
 
-	err := tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err != nil {
-		t.Fatalf("Failed validating block in isolation: %v", err)
-	}
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err != nil {
+			t.Fatalf("Failed validating block in isolation: %v", err)
+		}
 
-	// Test with block with wrong transactions sorting order
-	blockHash = consensushashing.BlockHash(&blockWithWrongTxOrder)
-	tc.BlockStore().Stage(stagingArea, blockHash, &blockWithWrongTxOrder)
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if !errors.Is(err, ruleerrors.ErrTransactionsNotSorted) {
-		t.Errorf("CheckBlockSanity: Expected ErrTransactionsNotSorted error, instead got %v", err)
-	}
+		// Test with block with wrong transactions sorting order
+		blockHash = consensushashing.BlockHash(&blockWithWrongTxOrder)
+		tc.BlockStore().Stage(stagingArea, blockHash, &blockWithWrongTxOrder)
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if !errors.Is(err, ruleerrors.ErrTransactionsNotSorted) {
+			t.Errorf("CheckBlockSanity: Expected ErrTransactionsNotSorted error, instead got %v", err)
+		}
 
-	// Test a block with invalid parents order
-	// We no longer require blocks to have ordered parents
-	blockHash = consensushashing.BlockHash(&unOrderedParentsBlock)
-	tc.BlockStore().Stage(stagingArea, blockHash, &unOrderedParentsBlock)
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err != nil {
-		t.Errorf("CheckBlockSanity: Expected block to be be body in isolation valid, got error instead: %v", err)
-	}
+		// Test a block with invalid parents order
+		// We no longer require blocks to have ordered parents
+		blockHash = consensushashing.BlockHash(&unOrderedParentsBlock)
+		tc.BlockStore().Stage(stagingArea, blockHash, &unOrderedParentsBlock)
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err != nil {
+			t.Errorf("CheckBlockSanity: Expected block to be be body in isolation valid, got error instead: %v", err)
+		}
+	})
 }
 
 var unOrderedParentsBlock = externalapi.DomainBlock{
@@ -1044,41 +1025,59 @@ var blockWithWrongTxOrder = externalapi.DomainBlock{
 	},
 }
 
-func CheckBlockHashMerkleRoot(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
-	if err != nil {
-		t.Fatalf("BuildBlockWithParents: %+v", err)
-	}
-	blockWithInvalidMerkleRoot := block.Clone()
-	blockWithInvalidMerkleRoot.Transactions[0].Version += 1
+func TestCheckBlockHashMerkleRoot(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockHashMerkleRoot")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
 
-	_, err = tc.ValidateAndInsertBlock(blockWithInvalidMerkleRoot, true)
-	if !errors.Is(err, ruleerrors.ErrBadMerkleRoot) {
-		t.Fatalf("Unexpected error: %+v", err)
-	}
+		block, _, err := tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
+		if err != nil {
+			t.Fatalf("BuildBlockWithParents: %+v", err)
+		}
+		blockWithInvalidMerkleRoot := block.Clone()
+		blockWithInvalidMerkleRoot.Transactions[0].Version += 1
 
-	// Check that a block with invalid merkle root is not marked as invalid
-	// and can be re-added with the right transactions.
-	_, err = tc.ValidateAndInsertBlock(block, true)
-	if err != nil {
-		t.Fatalf("ValidateAndInsertBlock: %+v", err)
-	}
+		_, err = tc.ValidateAndInsertBlock(blockWithInvalidMerkleRoot, true)
+		if !errors.Is(err, ruleerrors.ErrBadMerkleRoot) {
+			t.Fatalf("Unexpected error: %+v", err)
+		}
+
+		// Check that a block with invalid merkle root is not marked as invalid
+		// and can be re-added with the right transactions.
+		_, err = tc.ValidateAndInsertBlock(block, true)
+		if err != nil {
+			t.Fatalf("ValidateAndInsertBlock: %+v", err)
+		}
+	})
 }
 
-func BlockMass(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := initBlockWithInvalidBlockMass(consensusConfig, tc)
-	if err != nil {
-		t.Fatalf("Error BuildBlockWithParents : %+v", err)
-	}
-	blockHash := consensushashing.BlockHash(block)
-	stagingArea := model.NewStagingArea()
-	tc.BlockStore().Stage(stagingArea, blockHash, block)
+func TestBlockMass(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestBlockMass")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
 
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err == nil || !errors.Is(err, ruleerrors.ErrBlockMassTooHigh) {
-		t.Fatalf("ValidateBodyInIsolationTest: TestBlockMass:"+
-			" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrBlockMassTooHigh, err)
-	}
+		block, _, err := initBlockWithInvalidBlockMass(consensusConfig, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		stagingArea := model.NewStagingArea()
+		tc.BlockStore().Stage(stagingArea, blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrBlockMassTooHigh) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestBlockMass:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrBlockMassTooHigh, err)
+		}
+	})
 }
 
 func initBlockWithInvalidBlockMass(consensusConfig *consensus.Config, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
@@ -1114,20 +1113,30 @@ func initBlockWithInvalidBlockMass(consensusConfig *consensus.Config, tc testapi
 	return tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx})
 }
 
-func CheckBlockDuplicateTransactions(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := initBlockWithDuplicateTransaction(consensusConfig, tc)
-	if err != nil {
-		t.Fatalf("Error BuildBlockWithParents : %+v", err)
-	}
-	blockHash := consensushashing.BlockHash(block)
-	stagingArea := model.NewStagingArea()
-	tc.BlockStore().Stage(stagingArea, blockHash, block)
+func TestCheckBlockDuplicateTransactions(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err == nil || !errors.Is(err, ruleerrors.ErrDuplicateTx) {
-		t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDuplicateTransactions:"+
-			" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDuplicateTx, err)
-	}
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockDuplicateTransactions")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithDuplicateTransaction(consensusConfig, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		stagingArea := model.NewStagingArea()
+		tc.BlockStore().Stage(stagingArea, blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrDuplicateTx) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDuplicateTransactions:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDuplicateTx, err)
+		}
+	})
 }
 
 func initBlockWithDuplicateTransaction(consensusConfig *consensus.Config, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
@@ -1161,20 +1170,30 @@ func initBlockWithDuplicateTransaction(consensusConfig *consensus.Config, tc tes
 	return tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx, tx})
 }
 
-func CheckBlockContainsOnlyOneCoinbase(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := initBlockWithMoreThanOneCoinbase(consensusConfig, tc)
-	if err != nil {
-		t.Fatalf("Error BuildBlockWithParents : %+v", err)
-	}
-	blockHash := consensushashing.BlockHash(block)
-	stagingArea := model.NewStagingArea()
-	tc.BlockStore().Stage(stagingArea, blockHash, block)
+func TestCheckBlockContainsOnlyOneCoinbase(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err == nil || !errors.Is(err, ruleerrors.ErrMultipleCoinbases) {
-		t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockContainsOnlyOneCoinbase:"+
-			" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrMultipleCoinbases, err)
-	}
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockContainsOnlyOneCoinbase")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithMoreThanOneCoinbase(consensusConfig, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		stagingArea := model.NewStagingArea()
+		tc.BlockStore().Stage(stagingArea, blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrMultipleCoinbases) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockContainsOnlyOneCoinbase:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrMultipleCoinbases, err)
+		}
+	})
 }
 
 func initBlockWithMoreThanOneCoinbase(consensusConfig *consensus.Config, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
@@ -1208,20 +1227,30 @@ func initBlockWithMoreThanOneCoinbase(consensusConfig *consensus.Config, tc test
 	return tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx})
 }
 
-func CheckBlockDoubleSpends(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := initBlockWithDoubleSpends(consensusConfig, tc)
-	if err != nil {
-		t.Fatalf("Error BuildBlockWithParents : %+v", err)
-	}
-	blockHash := consensushashing.BlockHash(block)
-	stagingArea := model.NewStagingArea()
-	tc.BlockStore().Stage(stagingArea, blockHash, block)
+func TestCheckBlockDoubleSpends(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 
-	err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err == nil || !errors.Is(err, ruleerrors.ErrDoubleSpendInSameBlock) {
-		t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDoubleSpends:"+
-			" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDoubleSpendInSameBlock, err)
-	}
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockDoubleSpends")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithDoubleSpends(consensusConfig, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		stagingArea := model.NewStagingArea()
+		tc.BlockStore().Stage(stagingArea, blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrDoubleSpendInSameBlock) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDoubleSpends:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDoubleSpendInSameBlock, err)
+		}
+	})
 }
 
 func initBlockWithDoubleSpends(consensusConfig *consensus.Config, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
@@ -1274,18 +1303,27 @@ func initBlockWithDoubleSpends(consensusConfig *consensus.Config, tc testapi.Tes
 		&emptyCoinbase, []*externalapi.DomainTransaction{tx, txSameOutpoint})
 }
 
-func CheckFirstBlockTransactionIsCoinbase(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
+func TestCheckFirstBlockTransactionIsCoinbase(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 
-	block := initBlockWithFirstTransactionDifferentThanCoinbase(consensusConfig)
-	blockHash := consensushashing.BlockHash(block)
-	stagingArea := model.NewStagingArea()
-	tc.BlockStore().Stage(stagingArea, blockHash, block)
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckFirstBlockTransactionIsCoinbase")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
 
-	err := tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
-	if err == nil || !errors.Is(err, ruleerrors.ErrFirstTxNotCoinbase) {
-		t.Fatalf("ValidateBodyInIsolationTest: TestCheckFirstBlockTransactionIsCoinbase:"+
-			" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrFirstTxNotCoinbase, err)
-	}
+		block := initBlockWithFirstTransactionDifferentThanCoinbase(consensusConfig)
+		blockHash := consensushashing.BlockHash(block)
+		stagingArea := model.NewStagingArea()
+		tc.BlockStore().Stage(stagingArea, blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(stagingArea, blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrFirstTxNotCoinbase) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckFirstBlockTransactionIsCoinbase:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrFirstTxNotCoinbase, err)
+		}
+	})
 }
 
 func initBlockWithFirstTransactionDifferentThanCoinbase(consensusConfig *consensus.Config) *externalapi.DomainBlock {

domain/consensus/processes/blockvalidator/block_header_in_context_test.go

@@ -67,8 +67,8 @@ func TestValidateMedianTime(t *testing.T) {
 
 		blockTime := tip.Header.TimeInMilliseconds()
 
-		for i := 0; i < 10; i++ {
-			blockTime += 100
+		for i := 0; i < 100; i++ {
+			blockTime += 1000
 			_, tipHash = addBlock(blockTime, []*externalapi.DomainHash{tipHash}, nil)
 		}
 
@@ -163,17 +163,16 @@ func TestCheckParentsIncest(t *testing.T) {
 
 func TestCheckMergeSizeLimit(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		consensusConfig.MergeSetSizeLimit = 5
+		consensusConfig.MergeSetSizeLimit = 2 * uint64(consensusConfig.K)
 		factory := consensus.NewFactory()
-		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckMergeSizeLimit")
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckParentsIncest")
 		if err != nil {
 			t.Fatalf("Error setting up consensus: %+v", err)
 		}
 		defer teardown(false)
 
 		chain1TipHash := consensusConfig.GenesisHash
-		// We add a chain larger by one than chain2 below, to make this one the selected chain
-		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit+1; i++ {
+		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit+2; i++ {
 			chain1TipHash, _, err = tc.AddBlock([]*externalapi.DomainHash{chain1TipHash}, nil, nil)
 			if err != nil {
 				t.Fatalf("AddBlock: %+v", err)
@@ -181,9 +180,7 @@ func TestCheckMergeSizeLimit(t *testing.T) {
 		}
 
 		chain2TipHash := consensusConfig.GenesisHash
-		// We add a merge set of size exactly MergeSetSizeLimit (to violate the limit),
-		// since selected parent is also counted
-		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit; i++ {
+		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit+1; i++ {
 			chain2TipHash, _, err = tc.AddBlock([]*externalapi.DomainHash{chain2TipHash}, nil, nil)
 			if err != nil {
 				t.Fatalf("AddBlock: %+v", err)
@@ -196,56 +193,3 @@ func TestCheckMergeSizeLimit(t *testing.T) {
 		}
 	})
 }
-
-func TestVirtualSelectionViolatingMergeSizeLimit(t *testing.T) {
-	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		consensusConfig.MergeSetSizeLimit = 2 * uint64(consensusConfig.K)
-		factory := consensus.NewFactory()
-		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestVirtualSelectionViolatingMergeSizeLimit")
-		if err != nil {
-			t.Fatalf("Error setting up consensus: %+v", err)
-		}
-		defer teardown(false)
-
-		chain1TipHash := consensusConfig.GenesisHash
-		// We add a chain larger than chain2 below, to make this one the selected chain
-		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit; i++ {
-			chain1TipHash, _, err = tc.AddBlock([]*externalapi.DomainHash{chain1TipHash}, nil, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-		}
-
-		chain2TipHash := consensusConfig.GenesisHash
-		// We add a merge set of size exactly MergeSetSizeLimit-1 (to still not violate the limit)
-		for i := uint64(0); i < consensusConfig.MergeSetSizeLimit-1; i++ {
-			chain2TipHash, _, err = tc.AddBlock([]*externalapi.DomainHash{chain2TipHash}, nil, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-		}
-
-		// We now add a single block over genesis which is expected to exceed the limit
-		_, _, err = tc.AddBlock([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
-		if err != nil {
-			t.Fatalf("AddBlock: %+v", err)
-		}
-
-		stagingArea := model.NewStagingArea()
-		virtualSelectedParent, err := tc.GetVirtualSelectedParent()
-		if err != nil {
-			t.Fatalf("GetVirtualSelectedParent: %+v", err)
-		}
-		selectedParentAnticone, err := tc.DAGTraversalManager().AnticoneFromVirtualPOV(stagingArea, virtualSelectedParent)
-		if err != nil {
-			t.Fatalf("AnticoneFromVirtualPOV: %+v", err)
-		}
-
-		// Test if Virtual's mergeset is too large
-		// Note: the selected parent itself is also counted in the mergeset limit
-		if len(selectedParentAnticone)+1 > (int)(consensusConfig.MergeSetSizeLimit) {
-			t.Fatalf("Virtual's mergset size (%d) exeeds merge set limit (%d)",
-				len(selectedParentAnticone)+1, consensusConfig.MergeSetSizeLimit)
-		}
-	})
-}

domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go

@@ -1,9 +1,6 @@
 package blockvalidator_test
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model/testapi"
-	"reflect"
-	"runtime"
 	"testing"
 
 	"github.com/kaspanet/kaspad/domain/consensus"
@@ -16,74 +13,73 @@ import (
 	"github.com/pkg/errors"
 )
 
-func TestBlockValidator_ValidateHeaderInIsolation(t *testing.T) {
-	tests := []func(t *testing.T, tc testapi.TestConsensus, cfg *consensus.Config){
-		CheckParentsLimit,
-		CheckBlockVersion,
-		CheckBlockTimestampInIsolation,
-	}
+func TestCheckParentsLimit(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		tc, teardown, err := consensus.NewFactory().NewTestConsensus(consensusConfig, "TestBlockValidator_ValidateHeaderInIsolation")
+		factory := consensus.NewFactory()
+
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckParentsLimit")
 		if err != nil {
 			t.Fatalf("Error setting up consensus: %+v", err)
 		}
 		defer teardown(false)
-		for _, test := range tests {
-			testName := runtime.FuncForPC(reflect.ValueOf(test).Pointer()).Name()
-			t.Run(testName, func(t *testing.T) {
-				test(t, tc, consensusConfig)
-			})
+
+		for i := externalapi.KType(0); i < consensusConfig.MaxBlockParents+1; i++ {
+			_, _, err = tc.AddBlock([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
+			if err != nil {
+				t.Fatalf("AddBlock: %+v", err)
+			}
+		}
+
+		tips, err := tc.Tips()
+		if err != nil {
+			t.Fatalf("Tips: %+v", err)
+		}
+
+		_, _, err = tc.AddBlock(tips, nil, nil)
+		if !errors.Is(err, ruleerrors.ErrTooManyParents) {
+			t.Fatalf("Unexpected error: %+v", err)
 		}
 	})
 }
 
-func CheckParentsLimit(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	for i := externalapi.KType(0); i < consensusConfig.MaxBlockParents+1; i++ {
-		_, _, err := tc.AddBlock([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
+func TestCheckBlockVersion(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
+		factory := consensus.NewFactory()
+
+		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestCheckBlockVersion")
 		if err != nil {
-			t.Fatalf("AddBlock: %+v", err)
+			t.Fatalf("Error setting up consensus: %+v", err)
 		}
-	}
+		defer teardown(false)
 
-	tips, err := tc.Tips()
-	if err != nil {
-		t.Fatalf("Tips: %+v", err)
-	}
+		block, _, err := tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
+		if err != nil {
+			t.Fatalf("BuildBlockWithParents: %+v", err)
+		}
 
-	_, _, err = tc.AddBlock(tips, nil, nil)
-	if !errors.Is(err, ruleerrors.ErrTooManyParents) {
-		t.Fatalf("Unexpected error: %+v", err)
-	}
+		block.Header = blockheader.NewImmutableBlockHeader(
+			constants.MaxBlockVersion+1,
+			block.Header.Parents(),
+			block.Header.HashMerkleRoot(),
+			block.Header.AcceptedIDMerkleRoot(),
+			block.Header.UTXOCommitment(),
+			block.Header.TimeInMilliseconds(),
+			block.Header.Bits(),
+			block.Header.Nonce(),
+			block.Header.DAAScore(),
+			block.Header.BlueScore(),
+			block.Header.BlueWork(),
+			block.Header.PruningPoint(),
+		)
+
+		_, err = tc.ValidateAndInsertBlock(block, true)
+		if !errors.Is(err, ruleerrors.ErrBlockVersionIsUnknown) {
+			t.Fatalf("Unexpected error: %+v", err)
+		}
+	})
 }
 
-func CheckBlockVersion(t *testing.T, tc testapi.TestConsensus, consensusConfig *consensus.Config) {
-	block, _, err := tc.BuildBlockWithParents([]*externalapi.DomainHash{consensusConfig.GenesisHash}, nil, nil)
-	if err != nil {
-		t.Fatalf("BuildBlockWithParents: %+v", err)
-	}
-
-	block.Header = blockheader.NewImmutableBlockHeader(
-		constants.MaxBlockVersion+1,
-		block.Header.Parents(),
-		block.Header.HashMerkleRoot(),
-		block.Header.AcceptedIDMerkleRoot(),
-		block.Header.UTXOCommitment(),
-		block.Header.TimeInMilliseconds(),
-		block.Header.Bits(),
-		block.Header.Nonce(),
-		block.Header.DAAScore(),
-		block.Header.BlueScore(),
-		block.Header.BlueWork(),
-		block.Header.PruningPoint(),
-	)
-
-	_, err = tc.ValidateAndInsertBlock(block, true)
-	if !errors.Is(err, ruleerrors.ErrBlockVersionIsUnknown) {
-		t.Fatalf("Unexpected error: %+v", err)
-	}
-}
-
-func CheckBlockTimestampInIsolation(t *testing.T, tc testapi.TestConsensus, cfg *consensus.Config) {
+func TestCheckBlockTimestampInIsolation(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 		factory := consensus.NewFactory()
 

domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty.go

@@ -49,11 +49,9 @@ func (v *blockValidator) ValidatePruningPointViolationAndProofOfWorkAndDifficult
 		}
 	}
 
-	if !blockHash.Equal(v.genesisHash) {
-		err = v.checkProofOfWork(header)
-		if err != nil {
-			return err
-		}
+	err = v.checkProofOfWork(header)
+	if err != nil {
+		return err
 	}
 
 	err = v.validateDifficulty(stagingArea, blockHash, isBlockWithTrustedData)

domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go

@@ -101,13 +101,10 @@ func TestPOW(t *testing.T) {
 			t.Fatal(err)
 		}
 		random := rand.New(rand.NewSource(0))
-		// Difficulty is too high on mainnet to actually mine.
-		if consensusConfig.Name != "kaspa-mainnet" {
-			mining.SolveBlock(validBlock, random)
-			_, err = tc.ValidateAndInsertBlock(validBlock, true)
-			if err != nil {
-				t.Fatal(err)
-			}
+		mining.SolveBlock(validBlock, random)
+		_, err = tc.ValidateAndInsertBlock(validBlock, true)
+		if err != nil {
+			t.Fatal(err)
 		}
 	})
 }
@@ -299,7 +296,7 @@ func TestCheckPruningPointViolation(t *testing.T) {
 func TestValidateDifficulty(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
 		factory := consensus.NewFactory()
-		mocDifficulty := &mocDifficultyManager{genesisDaaScore: consensusConfig.GenesisBlock.Header.DAAScore()}
+		mocDifficulty := &mocDifficultyManager{}
 		factory.SetTestDifficultyManager(func(_ model.DBReader, _ model.GHOSTDAGManager, _ model.GHOSTDAGDataStore,
 			_ model.BlockHeaderStore, daaBlocksStore model.DAABlocksStore, _ model.DAGTopologyManager,
 			_ model.DAGTraversalManager, _ *big.Int, _ int, _ bool, _ time.Duration,
@@ -345,7 +342,6 @@ type mocDifficultyManager struct {
 	testDifficulty  uint32
 	testGenesisBits uint32
 	daaBlocksStore  model.DAABlocksStore
-	genesisDaaScore uint64
 }
 
 // RequiredDifficulty returns the difficulty required for the test
@@ -356,7 +352,7 @@ func (dm *mocDifficultyManager) RequiredDifficulty(*model.StagingArea, *external
 // StageDAADataAndReturnRequiredDifficulty returns the difficulty required for the test
 func (dm *mocDifficultyManager) StageDAADataAndReturnRequiredDifficulty(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, isBlockWithTrustedData bool) (uint32, error) {
 	// Populate daaBlocksStore with fake values
-	dm.daaBlocksStore.StageDAAScore(stagingArea, blockHash, dm.genesisDaaScore)
+	dm.daaBlocksStore.StageDAAScore(stagingArea, blockHash, 0)
 	dm.daaBlocksStore.StageBlockDAAAddedBlocks(stagingArea, blockHash, nil)
 
 	return dm.testDifficulty, nil

domain/consensus/processes/coinbasemanager/block_reward_switch_test.go

@@ -86,5 +86,36 @@ func TestBlockRewardSwitch(t *testing.T) {
 				t.Fatalf("Subsidy has unexpected value. Want: %d, got: %d", consensusConfig.MinSubsidy, subsidy)
 			}
 		}
+
+		// Add another block. We expect it to be another pruning point
+		lastPruningPointHash, _, err := tc.AddBlock([]*externalapi.DomainHash{tipHash}, nil, nil)
+		if err != nil {
+			t.Fatalf("AddBlock: %+v", err)
+		}
+
+		// Make sure that another pruning point had been added
+		pruningPointHeaders, err = tc.PruningPointHeaders()
+		if err != nil {
+			t.Fatalf("PruningPointHeaders: %+v", pruningPointHeaders)
+		}
+		expectedPruningPointHeaderAmount = expectedPruningPointHeaderAmount + 1
+		if uint64(len(pruningPointHeaders)) != expectedPruningPointHeaderAmount {
+			t.Fatalf("Unexpected amount of pruning point headers. "+
+				"Want: %d, got: %d", expectedPruningPointHeaderAmount, len(pruningPointHeaders))
+		}
+
+		// Make sure that the last pruning point has a post-switch subsidy
+		lastPruningPoint, err := tc.GetBlock(lastPruningPointHash)
+		if err != nil {
+			t.Fatalf("GetBlock: %+v", err)
+		}
+		lastPruningPointCoinbase := lastPruningPoint.Transactions[transactionhelper.CoinbaseTransactionIndex]
+		_, _, subsidy, err := tc.CoinbaseManager().ExtractCoinbaseDataBlueScoreAndSubsidy(lastPruningPointCoinbase)
+		if err != nil {
+			t.Fatalf("ExtractCoinbaseDataBlueScoreAndSubsidy: %+v", err)
+		}
+		if subsidy != consensusConfig.SubsidyGenesisReward {
+			t.Fatalf("Subsidy has unexpected value. Want: %d, got: %d", consensusConfig.SubsidyGenesisReward, subsidy)
+		}
 	})
 }

domain/consensus/processes/coinbasemanager/coinbasemanager.go

@@ -2,8 +2,6 @@ package coinbasemanager
 
 import (
 	"encoding/binary"
-	"math/big"
-
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
@@ -12,6 +10,7 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/utils/transactionhelper"
 	"github.com/kaspanet/kaspad/infrastructure/db/database"
 	"github.com/pkg/errors"
+	"math/big"
 )
 
 type coinbaseManager struct {
@@ -191,7 +190,51 @@ func (c *coinbaseManager) CalcBlockSubsidy(stagingArea *model.StagingArea,
 		return c.subsidyGenesisReward, nil
 	}
 
-	return c.maxSubsidy, nil
+	isBlockRewardFixed, err := c.isBlockRewardFixed(stagingArea, blockPruningPoint)
+	if err != nil {
+		return 0, err
+	}
+	if isBlockRewardFixed {
+		return c.subsidyGenesisReward, nil
+	}
+
+	averagePastSubsidy, err := c.calculateAveragePastSubsidy(stagingArea, blockHash)
+	if err != nil {
+		return 0, err
+	}
+	mergeSetSubsidySum, err := c.calculateMergeSetSubsidySum(stagingArea, blockHash)
+	if err != nil {
+		return 0, err
+	}
+	subsidyRandomVariable, err := c.calculateSubsidyRandomVariable(stagingArea, blockHash)
+	if err != nil {
+		return 0, err
+	}
+
+	pastSubsidy := new(big.Rat).Mul(averagePastSubsidy, c.subsidyPastRewardMultiplier)
+	mergeSetSubsidy := new(big.Rat).Mul(mergeSetSubsidySum, c.subsidyMergeSetRewardMultiplier)
+
+	// In order to avoid unsupported negative exponents in powInt64, flip
+	// the numerator and the denominator manually
+	subsidyRandom := new(big.Rat)
+	if subsidyRandomVariable >= 0 {
+		subsidyRandom = subsidyRandom.SetInt64(1 << subsidyRandomVariable)
+	} else {
+		subsidyRandom = subsidyRandom.SetFrac64(1, 1<<(-subsidyRandomVariable))
+	}
+
+	blockSubsidyBigRat := new(big.Rat).Add(mergeSetSubsidy, new(big.Rat).Mul(pastSubsidy, subsidyRandom))
+	blockSubsidyBigInt := new(big.Int).Div(blockSubsidyBigRat.Num(), blockSubsidyBigRat.Denom())
+	blockSubsidyUint64 := blockSubsidyBigInt.Uint64()
+
+	clampedBlockSubsidy := blockSubsidyUint64
+	if clampedBlockSubsidy < c.minSubsidy {
+		clampedBlockSubsidy = c.minSubsidy
+	} else if clampedBlockSubsidy > c.maxSubsidy {
+		clampedBlockSubsidy = c.maxSubsidy
+	}
+
+	return clampedBlockSubsidy, nil
 }
 
 func (c *coinbaseManager) calculateAveragePastSubsidy(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*big.Rat, error) {

domain/consensus/processes/consensusstatemanager/add_block_to_virtual_test.go

@@ -75,7 +75,7 @@ func TestVirtualDiff(t *testing.T) {
 			blockB.Transactions[0].Outputs[0].Value,
 			blockB.Transactions[0].Outputs[0].ScriptPublicKey,
 			true,
-			consensusConfig.GenesisBlock.Header.DAAScore()+2, //Expected virtual DAA score
+			2, //Expected virtual DAA score
 		)) {
 			t.Fatalf("Unexpected entry %s", entry)
 		}

domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go

@@ -2,6 +2,7 @@ package consensusstatemanager
 
 import (
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/multiset"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/pkg/errors"
@@ -22,16 +23,8 @@ func (csm *consensusStateManager) CalculatePastUTXOAndAcceptanceData(stagingArea
 
 	if blockHash.Equal(csm.genesisHash) {
 		log.Debugf("Block %s is the genesis. By definition, "+
-			"it has a predefined UTXO diff, empty acceptance data, and a predefined multiset", blockHash)
-		multiset, err := csm.multisetStore.Get(csm.databaseContext, stagingArea, blockHash)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-		utxoDiff, err := csm.utxoDiffStore.UTXODiff(csm.databaseContext, stagingArea, blockHash)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-		return utxoDiff, externalapi.AcceptanceData{}, multiset, nil
+			"it has an empty UTXO diff, empty acceptance data, and a blank multiset", blockHash)
+		return utxo.NewUTXODiff(), externalapi.AcceptanceData{}, multiset.New(), nil
 	}
 
 	blockGHOSTDAGData, err := csm.ghostdagDataStore.Get(csm.databaseContext, stagingArea, blockHash, false)

domain/consensus/processes/consensusstatemanager/multisets.go

@@ -4,6 +4,7 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/multiset"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 )
 
@@ -18,8 +19,8 @@ func (csm *consensusStateManager) calculateMultiset(stagingArea *model.StagingAr
 
 	if blockHash.Equal(csm.genesisHash) {
 		log.Debugf("Selected parent is nil, which could only happen for the genesis. " +
-			"The genesis has a predefined multiset")
-		return csm.multisetStore.Get(csm.databaseContext, stagingArea, blockHash)
+			"The genesis, by definition, has an empty multiset")
+		return multiset.New(), nil
 	}
 
 	ms, err := csm.multisetStore.Get(csm.databaseContext, stagingArea, blockGHOSTDAGData.SelectedParent())

domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go

@@ -59,8 +59,7 @@ func (csm *consensusStateManager) pickVirtualParents(stagingArea *model.StagingA
 	selectedVirtualParents := []*externalapi.DomainHash{virtualSelectedParent}
 	mergeSetSize := uint64(1) // starts counting from 1 because selectedParent is already in the mergeSet
 
-	// First condition implies that no point in searching since limit was already reached
-	for mergeSetSize < csm.mergeSetSizeLimit && len(candidates) > 0 && uint64(len(selectedVirtualParents)) < uint64(csm.maxBlockParents) {
+	for len(candidates) > 0 && uint64(len(selectedVirtualParents)) < uint64(csm.maxBlockParents) {
 		candidate := candidates[0]
 		candidates = candidates[1:]
 

domain/consensus/processes/consensusstatemanager/resolve_block_status.go

@@ -3,6 +3,8 @@ package consensusstatemanager
 import (
 	"fmt"
 
+	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
+
 	"github.com/kaspanet/kaspad/util/staging"
 
 	"github.com/kaspanet/kaspad/domain/consensus/model"
@@ -127,11 +129,7 @@ func (csm *consensusStateManager) selectedParentInfo(
 	if lastUnverifiedBlock.Equal(csm.genesisHash) {
 		log.Debugf("the most recent unverified block is the genesis block, "+
 			"which by definition has status: %s", externalapi.StatusUTXOValid)
-		utxoDiff, err := csm.utxoDiffStore.UTXODiff(csm.databaseContext, stagingArea, lastUnverifiedBlock)
-		if err != nil {
-			return nil, 0, nil, err
-		}
-		return lastUnverifiedBlock, externalapi.StatusUTXOValid, utxoDiff, nil
+		return lastUnverifiedBlock, externalapi.StatusUTXOValid, utxo.NewUTXODiff(), nil
 	}
 	lastUnverifiedBlockGHOSTDAGData, err := csm.ghostdagDataStore.Get(csm.databaseContext, stagingArea, lastUnverifiedBlock, false)
 	if err != nil {

domain/consensus/processes/consensusstatemanager/resolve_block_status_test.go

@@ -285,7 +285,7 @@ func TestTransactionAcceptance(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Error getting blockF: %+v", err)
 		}
-		updatedDAAScoreVirtualBlock := consensusConfig.GenesisBlock.Header.DAAScore() + 26
+		updatedDAAScoreVirtualBlock := 26
 		//We expect the second transaction in the "blue block" (blueChildOfRedBlock) to be accepted because the merge set is ordered topologically
 		//and the red block is ordered topologically before the "blue block" so the input is known in the UTXOSet.
 		expectedAcceptanceData := externalapi.AcceptanceData{

domain/consensus/processes/dagtraversalmanager/window_test.go

@@ -40,12 +40,12 @@ func TestBlockWindow(t *testing.T) {
 			{
 				parents:        []string{"C", "D"},
 				id:             "E",
-				expectedWindow: []string{"D", "C", "B"},
+				expectedWindow: []string{"C", "D", "B"},
 			},
 			{
 				parents:        []string{"C", "D"},
 				id:             "F",
-				expectedWindow: []string{"D", "C", "B"},
+				expectedWindow: []string{"C", "D", "B"},
 			},
 			{
 				parents:        []string{"A"},
@@ -60,38 +60,37 @@ func TestBlockWindow(t *testing.T) {
 			{
 				parents:        []string{"H", "F"},
 				id:             "I",
-				expectedWindow: []string{"F", "D", "H", "C", "G", "B"},
+				expectedWindow: []string{"F", "H", "C", "D", "B", "G"},
 			},
 			{
 				parents:        []string{"I"},
 				id:             "J",
-				expectedWindow: []string{"I", "F", "D", "H", "C", "G", "B"},
+				expectedWindow: []string{"I", "F", "H", "C", "D", "B", "G"},
 			},
-			//
 			{
 				parents:        []string{"J"},
 				id:             "K",
-				expectedWindow: []string{"J", "I", "F", "D", "H", "C", "G", "B"},
+				expectedWindow: []string{"J", "I", "F", "H", "C", "D", "B", "G"},
 			},
 			{
 				parents:        []string{"K"},
 				id:             "L",
-				expectedWindow: []string{"K", "J", "I", "F", "D", "H", "C", "G", "B"},
+				expectedWindow: []string{"K", "J", "I", "F", "H", "C", "D", "B", "G"},
 			},
 			{
 				parents:        []string{"L"},
 				id:             "M",
-				expectedWindow: []string{"L", "K", "J", "I", "F", "D", "H", "C", "G", "B"},
+				expectedWindow: []string{"L", "K", "J", "I", "F", "H", "C", "D", "B", "G"},
 			},
 			{
 				parents:        []string{"M"},
 				id:             "N",
-				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "D", "H", "C", "G"},
+				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "H", "C", "D", "B"},
 			},
 			{
 				parents:        []string{"N"},
 				id:             "O",
-				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "D", "H", "C"},
+				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "H", "C", "D"},
 			},
 		},
 		dagconfig.TestnetParams.Name: {
@@ -133,37 +132,37 @@ func TestBlockWindow(t *testing.T) {
 			{
 				parents:        []string{"H", "F"},
 				id:             "I",
-				expectedWindow: []string{"F", "C", "D", "H", "B", "G"},
+				expectedWindow: []string{"F", "H", "C", "D", "G", "B"},
 			},
 			{
 				parents:        []string{"I"},
 				id:             "J",
-				expectedWindow: []string{"I", "F", "C", "D", "H", "B", "G"},
+				expectedWindow: []string{"I", "F", "H", "C", "D", "G", "B"},
 			},
 			{
 				parents:        []string{"J"},
 				id:             "K",
-				expectedWindow: []string{"J", "I", "F", "C", "D", "H", "B", "G"},
+				expectedWindow: []string{"J", "I", "F", "H", "C", "D", "G", "B"},
 			},
 			{
 				parents:        []string{"K"},
 				id:             "L",
-				expectedWindow: []string{"K", "J", "I", "F", "C", "D", "H", "B", "G"},
+				expectedWindow: []string{"K", "J", "I", "F", "H", "C", "D", "G", "B"},
 			},
 			{
 				parents:        []string{"L"},
 				id:             "M",
-				expectedWindow: []string{"L", "K", "J", "I", "F", "C", "D", "H", "B", "G"},
+				expectedWindow: []string{"L", "K", "J", "I", "F", "H", "C", "D", "G", "B"},
 			},
 			{
 				parents:        []string{"M"},
 				id:             "N",
-				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "C", "D", "H", "B"},
+				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "H", "C", "D", "G"},
 			},
 			{
 				parents:        []string{"N"},
 				id:             "O",
-				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "C", "D", "H"},
+				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "H", "C", "D"},
 			},
 		},
 		dagconfig.DevnetParams.Name: {
@@ -205,37 +204,37 @@ func TestBlockWindow(t *testing.T) {
 			{
 				parents:        []string{"H", "F"},
 				id:             "I",
-				expectedWindow: []string{"F", "D", "H", "C", "B", "G"},
+				expectedWindow: []string{"F", "D", "C", "H", "B", "G"},
 			},
 			{
 				parents:        []string{"I"},
 				id:             "J",
-				expectedWindow: []string{"I", "F", "D", "H", "C", "B", "G"},
+				expectedWindow: []string{"I", "F", "D", "C", "H", "B", "G"},
 			},
 			{
 				parents:        []string{"J"},
 				id:             "K",
-				expectedWindow: []string{"J", "I", "F", "D", "H", "C", "B", "G"},
+				expectedWindow: []string{"J", "I", "F", "D", "C", "H", "B", "G"},
 			},
 			{
 				parents:        []string{"K"},
 				id:             "L",
-				expectedWindow: []string{"K", "J", "I", "F", "D", "H", "C", "B", "G"},
+				expectedWindow: []string{"K", "J", "I", "F", "D", "C", "H", "B", "G"},
 			},
 			{
 				parents:        []string{"L"},
 				id:             "M",
-				expectedWindow: []string{"L", "K", "J", "I", "F", "D", "H", "C", "B", "G"},
+				expectedWindow: []string{"L", "K", "J", "I", "F", "D", "C", "H", "B", "G"},
 			},
 			{
 				parents:        []string{"M"},
 				id:             "N",
-				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "D", "H", "C", "B"},
+				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "D", "C", "H", "B"},
 			},
 			{
 				parents:        []string{"N"},
 				id:             "O",
-				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "D", "H", "C"},
+				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "D", "C", "H"},
 			},
 		},
 		dagconfig.SimnetParams.Name: {
@@ -277,37 +276,37 @@ func TestBlockWindow(t *testing.T) {
 			{
 				parents:        []string{"H", "F"},
 				id:             "I",
-				expectedWindow: []string{"F", "H", "D", "C", "B", "G"},
+				expectedWindow: []string{"F", "D", "H", "C", "G", "B"},
 			},
 			{
 				parents:        []string{"I"},
 				id:             "J",
-				expectedWindow: []string{"I", "F", "H", "D", "C", "B", "G"},
+				expectedWindow: []string{"I", "F", "D", "H", "C", "G", "B"},
 			},
 			{
 				parents:        []string{"J"},
 				id:             "K",
-				expectedWindow: []string{"J", "I", "F", "H", "D", "C", "B", "G"},
+				expectedWindow: []string{"J", "I", "F", "D", "H", "C", "G", "B"},
 			},
 			{
 				parents:        []string{"K"},
 				id:             "L",
-				expectedWindow: []string{"K", "J", "I", "F", "H", "D", "C", "B", "G"},
+				expectedWindow: []string{"K", "J", "I", "F", "D", "H", "C", "G", "B"},
 			},
 			{
 				parents:        []string{"L"},
 				id:             "M",
-				expectedWindow: []string{"L", "K", "J", "I", "F", "H", "D", "C", "B", "G"},
+				expectedWindow: []string{"L", "K", "J", "I", "F", "D", "H", "C", "G", "B"},
 			},
 			{
 				parents:        []string{"M"},
 				id:             "N",
-				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "H", "D", "C", "B"},
+				expectedWindow: []string{"M", "L", "K", "J", "I", "F", "D", "H", "C", "G"},
 			},
 			{
 				parents:        []string{"N"},
 				id:             "O",
-				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "H", "D", "C"},
+				expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "D", "H", "C"},
 			},
 		},
 	}

domain/consensus/processes/difficultymanager/difficultymanager.go

@@ -105,14 +105,10 @@ func (dm *difficultyManager) requiredDifficultyFromTargetsWindow(targetsWindow b
 		return dm.genesisBits, nil
 	}
 
-	// in the past this was < 2 as the comment explains, we changed it to under the window size to
-	// make the hashrate(which is ~1.5GH/s) constant in the first 2641 blocks so that we won't have a lot of tips
-
 	// We need at least 2 blocks to get a timestamp interval
 	// We could instead clamp the timestamp difference to `targetTimePerBlock`,
 	// but then everything will cancel out and we'll get the target from the last block, which will be the same as genesis.
-	// We add 64 as a safety margin
-	if len(targetsWindow) < 2 || len(targetsWindow) < dm.difficultyAdjustmentWindowSize + 64 {
+	if len(targetsWindow) < 2 {
 		return dm.genesisBits, nil
 	}
 	windowMinTimestamp, windowMaxTimeStamp, windowsMinIndex, _ := targetsWindow.minMaxTimestamps()
@@ -161,11 +157,7 @@ func (dm *difficultyManager) calculateDaaScoreAndAddedBlocks(stagingArea *model.
 	isBlockWithTrustedData bool) (uint64, []*externalapi.DomainHash, error) {
 
 	if blockHash.Equal(dm.genesisHash) {
-		genesisHeader, err := dm.headerStore.BlockHeader(dm.databaseContext, stagingArea, dm.genesisHash)
-		if err != nil {
-			return 0, nil, err
-		}
-		return genesisHeader.DAAScore(), nil, nil
+		return 0, nil, nil
 	}
 
 	ghostdagData, err := dm.ghostdagStore.Get(dm.databaseContext, stagingArea, blockHash, false)

domain/consensus/processes/difficultymanager/difficultymanager_test.go

@@ -19,6 +19,12 @@ import (
 
 func TestDifficulty(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
+		// Mainnet's genesis is too new, so if we'll build on it we'll get to the future very quickly.
+		// TODO: Once it gets older, we should unskip this test.
+		if consensusConfig.Name == "kaspa-mainnet" {
+			return
+		}
+
 		if consensusConfig.DisableDifficultyAdjustment {
 			return
 		}
@@ -31,7 +37,7 @@ func TestDifficulty(t *testing.T) {
 		}
 
 		consensusConfig.K = 1
-		consensusConfig.DifficultyAdjustmentWindowSize = 140
+		consensusConfig.DifficultyAdjustmentWindowSize = 265
 
 		factory := consensus.NewFactory()
 		tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestDifficulty")
@@ -108,7 +114,7 @@ func TestDifficulty(t *testing.T) {
 					"window size, the difficulty should be the same as genesis'")
 			}
 		}
-		for i := 0; i < consensusConfig.DifficultyAdjustmentWindowSize+10; i++ {
+		for i := 0; i < consensusConfig.DifficultyAdjustmentWindowSize+100; i++ {
 			tip, tipHash = addBlock(0, tipHash)
 			if tip.Header.Bits() != consensusConfig.GenesisBlock.Header.Bits() {
 				t.Fatalf("As long as the block rate remains the same, the difficulty shouldn't change")
@@ -130,9 +136,9 @@ func TestDifficulty(t *testing.T) {
 		var expectedBits uint32
 		switch consensusConfig.Name {
 		case dagconfig.TestnetParams.Name, dagconfig.DevnetParams.Name:
-			expectedBits = uint32(0x1e7f1441)
+			expectedBits = uint32(0x1e7f83df)
 		case dagconfig.MainnetParams.Name:
-			expectedBits = uint32(0x1d02c50f)
+			expectedBits = uint32(0x1e7f83df)
 		}
 
 		if tip.Header.Bits() != expectedBits {
@@ -231,7 +237,7 @@ func TestDifficulty(t *testing.T) {
 
 func TestDAAScore(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		consensusConfig.DifficultyAdjustmentWindowSize = 86
+		consensusConfig.DifficultyAdjustmentWindowSize = 265
 
 		stagingArea := model.NewStagingArea()
 
@@ -263,9 +269,9 @@ func TestDAAScore(t *testing.T) {
 			t.Fatalf("DAAScore: %+v", err)
 		}
 
-		blockBlueScore3ExpectedDAAScore := uint64(2) + consensusConfig.GenesisBlock.Header.DAAScore()
+		blockBlueScore3ExpectedDAAScore := uint64(2)
 		if blockBlueScore3DAAScore != blockBlueScore3ExpectedDAAScore {
-			t.Fatalf("DAA score is expected to be %d but got %d", blockBlueScore3ExpectedDAAScore, blockBlueScore3DAAScore)
+			t.Fatalf("DAA score is expected to be %d but got %d", blockBlueScore3ExpectedDAAScore, blockBlueScore3ExpectedDAAScore)
 		}
 		tipDAAScore := blockBlueScore3ExpectedDAAScore
 

domain/consensus/processes/parentsmanager/parentsmanager.go

@@ -7,31 +7,35 @@ import (
 )
 
 type parentsManager struct {
-	genesisHash *externalapi.DomainHash
+	hardForkOmitGenesisFromParentsDAAScore uint64
+	genesisHash                            *externalapi.DomainHash
 }
 
-// New instantiates a new ParentsManager
-func New(genesisHash *externalapi.DomainHash) model.ParentsManager {
+// New instantiates a new HeadersSelectedTipManager
+func New(genesisHash *externalapi.DomainHash, hardForkOmitGenesisFromParentsDAAScore uint64) model.ParentsManager {
 	return &parentsManager{
-		genesisHash: genesisHash,
+		genesisHash:                            genesisHash,
+		hardForkOmitGenesisFromParentsDAAScore: hardForkOmitGenesisFromParentsDAAScore,
 	}
 }
 
 func (pm *parentsManager) ParentsAtLevel(blockHeader externalapi.BlockHeader, level int) externalapi.BlockLevelParents {
-	var parentsAtLevel externalapi.BlockLevelParents
-	if len(blockHeader.Parents()) > level {
-		parentsAtLevel = blockHeader.Parents()[level]
+	if len(blockHeader.Parents()) <= level {
+		if blockHeader.DAAScore() >= pm.hardForkOmitGenesisFromParentsDAAScore {
+			return externalapi.BlockLevelParents{pm.genesisHash}
+		}
+		return externalapi.BlockLevelParents{}
 	}
 
-	if len(parentsAtLevel) == 0 && len(blockHeader.DirectParents()) > 0 {
-		return externalapi.BlockLevelParents{pm.genesisHash}
-	}
-
-	return parentsAtLevel
+	return blockHeader.Parents()[level]
 }
 
 func (pm *parentsManager) Parents(blockHeader externalapi.BlockHeader) []externalapi.BlockLevelParents {
-	numParents := constants.MaxBlockLevel + 1
+	numParents := len(blockHeader.Parents())
+	if blockHeader.DAAScore() >= pm.hardForkOmitGenesisFromParentsDAAScore {
+		numParents = constants.MaxBlockLevel + 1
+	}
+
 	parents := make([]externalapi.BlockLevelParents, numParents)
 	for i := 0; i < numParents; i++ {
 		parents[i] = pm.ParentsAtLevel(blockHeader, i)

domain/consensus/processes/pruningmanager/pruning_test.go

@@ -2,6 +2,7 @@ package pruningmanager_test
 
 import (
 	"encoding/json"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
 	"github.com/kaspanet/kaspad/infrastructure/db/database"
 	"os"
 	"path/filepath"
@@ -36,7 +37,7 @@ func TestPruning(t *testing.T) {
 			dagconfig.SimnetParams.Name:  "1582",
 		},
 		"dag-for-test-pruning.json": {
-			dagconfig.MainnetParams.Name: "503",
+			dagconfig.MainnetParams.Name: "502",
 			dagconfig.TestnetParams.Name: "502",
 			dagconfig.DevnetParams.Name:  "502",
 			dagconfig.SimnetParams.Name:  "502",
@@ -44,8 +45,6 @@ func TestPruning(t *testing.T) {
 	}
 
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		// Improve the performance of the test a little
-		consensusConfig.DisableDifficultyAdjustment = true
 		err := filepath.Walk("./testdata", func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				return err
@@ -73,7 +72,6 @@ func TestPruning(t *testing.T) {
 			consensusConfig.DifficultyAdjustmentWindowSize = 400
 
 			factory := consensus.NewFactory()
-			factory.SetTestLevelDBCacheSize(128)
 			tc, teardown, err := factory.NewTestConsensus(consensusConfig, "TestPruning")
 			if err != nil {
 				t.Fatalf("Error setting up consensus: %+v", err)
@@ -142,11 +140,12 @@ func TestPruning(t *testing.T) {
 			// We expect blocks that are within the difficulty adjustment window size of
 			// the pruning point and its anticone to not get pruned
 			unprunedBlockHashesBelowPruningPoint := make(map[externalapi.DomainHash]struct{})
-			pruningPointAndItsAnticone, err := tc.PruningPointAndItsAnticone()
+			pruningPointAndItsAnticone, err := tc.PruningPointAndItsAnticoneWithTrustedData()
 			if err != nil {
 				t.Fatalf("pruningPointAndItsAnticone: %+v", err)
 			}
-			for _, blockHash := range pruningPointAndItsAnticone {
+			for _, block := range pruningPointAndItsAnticone {
+				blockHash := consensushashing.BlockHash(block.Block)
 				unprunedBlockHashesBelowPruningPoint[*blockHash] = struct{}{}
 				blockWindow, err := tc.DAGTraversalManager().BlockWindow(stagingArea, blockHash, consensusConfig.DifficultyAdjustmentWindowSize)
 				if err != nil {

domain/consensus/processes/pruningmanager/pruningmanager.go

@@ -675,19 +675,7 @@ func (pm *pruningManager) calculateDiffBetweenPreviousAndCurrentPruningPoints(st
 	onEnd := logger.LogAndMeasureExecutionTime(log, "pruningManager.calculateDiffBetweenPreviousAndCurrentPruningPoints")
 	defer onEnd()
 	if currentPruningHash.Equal(pm.genesisHash) {
-		iter, err := pm.consensusStateManager.RestorePastUTXOSetIterator(stagingArea, currentPruningHash)
-		if err != nil {
-			return nil, err
-		}
-		set := make(map[externalapi.DomainOutpoint]externalapi.UTXOEntry)
-		for ok := iter.First(); ok; ok = iter.Next() {
-			outpoint, entry, err := iter.Get()
-			if err != nil {
-				return nil, err
-			}
-			set[*outpoint] = entry
-		}
-		return utxo.NewUTXODiffFromCollections(utxo.NewUTXOCollection(set), utxo.NewUTXOCollection(make(map[externalapi.DomainOutpoint]externalapi.UTXOEntry)))
+		return utxo.NewUTXODiff(), nil
 	}
 
 	pruningPointIndex, err := pm.pruningStore.CurrentPruningPointIndex(pm.databaseContext, stagingArea)
@@ -919,8 +907,8 @@ func (pm *pruningManager) PruneAllBlocksBelow(stagingArea *model.StagingArea, pr
 	return nil
 }
 
-func (pm *pruningManager) PruningPointAndItsAnticone() ([]*externalapi.DomainHash, error) {
-	onEnd := logger.LogAndMeasureExecutionTime(log, "PruningPointAndItsAnticone")
+func (pm *pruningManager) PruningPointAndItsAnticoneWithTrustedData() ([]*externalapi.BlockWithTrustedData, error) {
+	onEnd := logger.LogAndMeasureExecutionTime(log, "PruningPointAndItsAnticoneWithTrustedData")
 	defer onEnd()
 
 	stagingArea := model.NewStagingArea()
@@ -934,32 +922,34 @@ func (pm *pruningManager) PruningPointAndItsAnticone() ([]*externalapi.DomainHas
 		return nil, err
 	}
 
-	// Sorting the blocks in topological order
-	var sortErr error
-	sort.Slice(pruningPointAnticone, func(i, j int) bool {
-		headerI, err := pm.blockHeaderStore.BlockHeader(pm.databaseContext, stagingArea, pruningPointAnticone[i])
-		if err != nil {
-			sortErr = err
-			return false
-		}
+	blocks := make([]*externalapi.BlockWithTrustedData, 0, len(pruningPointAnticone)+1)
 
-		headerJ, err := pm.blockHeaderStore.BlockHeader(pm.databaseContext, stagingArea, pruningPointAnticone[j])
-		if err != nil {
-			sortErr = err
-			return false
-		}
-
-		return headerI.BlueWork().Cmp(headerJ.BlueWork()) < 0
-	})
-	if sortErr != nil {
-		return nil, sortErr
+	pruningPointWithTrustedData, err := pm.blockWithTrustedData(stagingArea, pruningPoint)
+	if err != nil {
+		return nil, err
 	}
 
+	for _, blockHash := range pruningPointAnticone {
+		blockWithTrustedData, err := pm.blockWithTrustedData(stagingArea, blockHash)
+		if err != nil {
+			return nil, err
+		}
+
+		blocks = append(blocks, blockWithTrustedData)
+	}
+
+	// Sorting the blocks in topological order
+	sort.Slice(blocks, func(i, j int) bool {
+		return blocks[i].Block.Header.BlueWork().Cmp(blocks[j].Block.Header.BlueWork()) < 0
+	})
+
 	// The pruning point should always come first
-	return append([]*externalapi.DomainHash{pruningPoint}, pruningPointAnticone...), nil
+	blocks = append([]*externalapi.BlockWithTrustedData{pruningPointWithTrustedData}, blocks...)
+
+	return blocks, nil
 }
 
-func (pm *pruningManager) BlockWithTrustedData(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*externalapi.BlockWithTrustedData, error) {
+func (pm *pruningManager) blockWithTrustedData(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*externalapi.BlockWithTrustedData, error) {
 	block, err := pm.blocksStore.Block(pm.databaseContext, stagingArea, blockHash)
 	if err != nil {
 		return nil, err

domain/consensus/timelock_CLTV_test.go

@@ -49,7 +49,7 @@ func TestCheckLockTimeVerifyConditionedByDAAScore(t *testing.T) {
 		}
 		fees := uint64(1)
 		//Create a CLTV script:
-		targetDAAScore := consensusConfig.GenesisBlock.Header.DAAScore() + uint64(30)
+		targetDAAScore := uint64(30)
 		redeemScriptCLTV, err := createScriptCLTV(targetDAAScore)
 		if err != nil {
 			t.Fatalf("Failed to create a script using createScriptCLTV: %v", err)
@@ -156,7 +156,7 @@ func TestCheckLockTimeVerifyConditionedByDAAScoreWithWrongLockTime(t *testing.T)
 		}
 		fees := uint64(1)
 		//Create a CLTV script:
-		targetDAAScore := consensusConfig.GenesisBlock.Header.DAAScore() + uint64(30)
+		targetDAAScore := uint64(30)
 		redeemScriptCLTV, err := createScriptCLTV(targetDAAScore)
 		if err != nil {
 			t.Fatalf("Failed to create a script using createScriptCLTV: %v", err)

domain/consensus/utils/constants/constants.go

@@ -37,7 +37,5 @@ const (
 	LockTimeThreshold = 5e11 // Tue Nov 5 00:53:20 1985 UTC
 
 	// MaxBlockLevel is the maximum possible block level.
-	// This is technically 255, but we clamped it at 256 - block level of mainnet genesis
-	// This means that any block that has a level lower or equal to genesis will be level 0.
-	MaxBlockLevel = 225
+	MaxBlockLevel = 255
 )

domain/consensus/utils/pow/pow.go

@@ -104,10 +104,9 @@ func BlockLevel(header externalapi.BlockHeader) int {
 	}
 
 	proofOfWorkValue := NewState(header.ToMutable()).CalculateProofOfWorkValue()
-	level := constants.MaxBlockLevel - proofOfWorkValue.BitLen()
-	// If the block has a level lower than genesis make it zero.
-	if level < 0 {
-		level = 0
+	for blockLevel := 0; ; blockLevel++ {
+		if blockLevel == constants.MaxBlockLevel || proofOfWorkValue.Bit(blockLevel+1) != 0 {
+			return blockLevel
+		}
 	}
-	return level
 }

domain/dagconfig/consensus_defaults.go

@@ -22,7 +22,7 @@ import (
 //
 
 const (
-	defaultMaxCoinbasePayloadLength = 204
+	defaultMaxCoinbasePayloadLength = 172
 	// defaultMaxBlockMass is a bound on the mass of a block, larger values increase the bound d
 	// on the round trip time of a block, which affects the other parameters as described below
 	defaultMaxBlockMass = 500_000
@@ -49,7 +49,7 @@ const (
 	defaultMergeSetSizeLimit                              = defaultGHOSTDAGK * 10
 	defaultSubsidyGenesisReward                           = 1 * constants.SompiPerKaspa
 	defaultMinSubsidy                                     = 1 * constants.SompiPerKaspa
-	defaultMaxSubsidy                                     = 500 * constants.SompiPerKaspa
+	defaultMaxSubsidy                                     = 1000 * constants.SompiPerKaspa
 	defaultBaseSubsidy                                    = 50 * constants.SompiPerKaspa
 	defaultFixedSubsidySwitchPruningPointInterval  uint64 = 7
 	defaultCoinbasePayloadScriptPublicKeyMaxLength        = 150

domain/dagconfig/genesis.go

@@ -36,14 +36,10 @@ var genesisTxPayload = []byte{
 	0x20, 0xd7, 0x90, 0xd7, 0x9c, 0xd7, 0x94, 0xd7,
 	0x9b, 0xd7, 0x9d, 0x20, 0xd7, 0xaa, 0xd7, 0xa2,
 	0xd7, 0x91, 0xd7, 0x93, 0xd7, 0x95, 0xd7, 0x9f,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Bitcoin block hash 0000000000000000000b1f8e1c17b0133d439174e52efbb0c41c3583a8aa66b0
-	0x00, 0x0b, 0x1f, 0x8e, 0x1c, 0x17, 0xb0, 0x13,
-	0x3d, 0x43, 0x91, 0x74 ,0xe5, 0x2e, 0xfb, 0xb0,
-	0xc4, 0x1c, 0x35, 0x83, 0xa8, 0xaa, 0x66, 0xb0,
-	0x0f, 0xca, 0x37, 0xca, 0x66, 0x7c, 0x2d, 0x55, // Checkpoint block hash 0fca37ca667c2d550a6c4416dad9717e50927128c424fa4edbebc436ab13aeef
-	0x0a, 0x6c, 0x44, 0x16, 0xda, 0xd9, 0x71, 0x7e,
-	0x50, 0x92, 0x71, 0x28, 0xc4, 0x24, 0xfa, 0x4e,
-	0xdb, 0xeb, 0xc4, 0x36, 0xab, 0x13, 0xae, 0xef,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Bitcoin block hash 00000000000000000001733c62adb19f1b77fa0735d0e11f25af36fc9ca908a5
+	0x00, 0x01, 0x73, 0x3c, 0x62, 0xad, 0xb1, 0x9f,
+	0x1b, 0x77, 0xfa, 0x07, 0x35, 0xd0, 0xe1, 0x1f,
+	0x25, 0xaf, 0x36, 0xfc, 0x9c, 0xa9, 0x08, 0xa5,
 }
 
 // genesisCoinbaseTx is the coinbase transaction for the genesis blocks for
@@ -54,13 +50,19 @@ var genesisCoinbaseTx = transactionhelper.NewSubnetworkTransaction(0, []*externa
 // genesisHash is the hash of the first block in the block DAG for the main
 // network (genesis block).
 var genesisHash = externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{
-	0x58, 0xc2, 0xd4, 0x19, 0x9e, 0x21, 0xf9, 0x10, 0xd1, 0x57, 0x1d, 0x11, 0x49, 0x69, 0xce, 0xce, 0xf4, 0x8f, 0x9, 0xf9, 0x34, 0xd4, 0x2c, 0xcb, 0x6a, 0x28, 0x1a, 0x15, 0x86, 0x8f, 0x29, 0x99,
+	0xca, 0xeb, 0x97, 0x96, 0x0a, 0x16, 0x0c, 0x21,
+	0x1a, 0x6b, 0x21, 0x96, 0xbd, 0x78, 0x39, 0x9f,
+	0xd4, 0xc4, 0xcc, 0x5b, 0x50, 0x9f, 0x55, 0xc1,
+	0x2c, 0x8a, 0x7d, 0x81, 0x5f, 0x75, 0x36, 0xea,
 })
 
 // genesisMerkleRoot is the hash of the first transaction in the genesis block
 // for the main network.
 var genesisMerkleRoot = externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{
-	0x8e, 0xc8, 0x98, 0x56, 0x8c, 0x68, 0x1, 0xd1, 0x3d, 0xf4, 0xee, 0x6e, 0x2a, 0x1b, 0x54, 0xb7, 0xe6, 0x23, 0x6f, 0x67, 0x1f, 0x20, 0x95, 0x4f, 0x5, 0x30, 0x64, 0x10, 0x51, 0x8e, 0xeb, 0x32,
+	0xca, 0xed, 0xaf, 0x7d, 0x4a, 0x08, 0xbb, 0xe8,
+	0x90, 0x11, 0x64, 0x0c, 0x48, 0x41, 0xb6, 0x6d,
+	0x5b, 0xba, 0x67, 0xd7, 0x28, 0x8c, 0xe6, 0xd6,
+	0x72, 0x28, 0xdb, 0x00, 0x09, 0x66, 0xe9, 0x74,
 })
 
 // genesisBlock defines the genesis block of the block DAG which serves as the
@@ -71,13 +73,11 @@ var genesisBlock = externalapi.DomainBlock{
 		[]externalapi.BlockLevelParents{},
 		genesisMerkleRoot,
 		&externalapi.DomainHash{},
-		externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{
-			0x71, 0x0f, 0x27, 0xdf, 0x42, 0x3e, 0x63, 0xaa, 0x6c, 0xdb, 0x72, 0xb8, 0x9e, 0xa5, 0xa0, 0x6c, 0xff, 0xa3, 0x99, 0xd6, 0x6f, 0x16, 0x77, 0x04, 0x45, 0x5b, 0x5a, 0xf5, 0x9d, 0xef, 0x8e, 0x20,
-		}),
-		1637609671037,
-		486722099,
+		externalapi.NewDomainHashFromByteArray(muhash.EmptyMuHashHash.AsArray()),
+		0x17cfb020c02,
+		0x1e7fffff,
 		0x3392c,
-		1312860, // Checkpoint DAA score
+		0,
 		0,
 		big.NewInt(0),
 		&externalapi.DomainHash{},

domain/dagconfig/params.go

@@ -186,6 +186,8 @@ type Params struct {
 	FixedSubsidySwitchPruningPointInterval uint64
 
 	FixedSubsidySwitchHashRateThreshold *big.Int
+
+	HardForkOmitGenesisFromParentsDAAScore uint64
 }
 
 // NormalizeRPCServerAddress returns addr with the current network default
@@ -211,15 +213,7 @@ var MainnetParams = Params{
 	Net:         appmessage.Mainnet,
 	RPCPort:     "16110",
 	DefaultPort: "16111",
-	DNSSeeds: []string{
-		"mainnet-dnsseed.daglabs-dev.com",
-		// This DNS seeder is run by Denis Mashkevich
-		"mainnet-dnsseed-1.kaspanet.org",
-		// This DNS seeder is run by Denis Mashkevich
-		"mainnet-dnsseed-2.kaspanet.org",
-		// This DNS seeder is run by Elichai Turkel
-		"kaspa.turkel.in",
-	},
+	DNSSeeds:    []string{"mainnet-dnsseed.daglabs-dev.com"},
 
 	// DAG parameters
 	GenesisBlock:                    &genesisBlock,
@@ -272,6 +266,7 @@ var MainnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	HardForkOmitGenesisFromParentsDAAScore:  2e6,
 }
 
 // TestnetParams defines the network parameters for the test Kaspa network.
@@ -334,6 +329,7 @@ var TestnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	HardForkOmitGenesisFromParentsDAAScore:  2e6,
 }
 
 // SimnetParams defines the network parameters for the simulation test Kaspa
@@ -400,6 +396,7 @@ var SimnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	HardForkOmitGenesisFromParentsDAAScore:  5,
 }
 
 // DevnetParams defines the network parameters for the development Kaspa network.
@@ -462,6 +459,7 @@ var DevnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	HardForkOmitGenesisFromParentsDAAScore:  3000,
 }
 
 var (

domain/miningmanager/miningmanager_test.go

@@ -40,7 +40,7 @@ func TestValidateAndInsertTransaction(t *testing.T) {
 		miningManager := miningFactory.NewMiningManager(consensusReference, &consensusConfig.Params, mempool.DefaultConfig(&consensusConfig.Params))
 		transactionsToInsert := make([]*externalapi.DomainTransaction, 10)
 		for i := range transactionsToInsert {
-			transactionsToInsert[i] = createTransactionWithUTXOEntry(t, i, 0)
+			transactionsToInsert[i] = createTransactionWithUTXOEntry(t, i)
 			_, err = miningManager.ValidateAndInsertTransaction(transactionsToInsert[i], false, true)
 			if err != nil {
 				t.Fatalf("ValidateAndInsertTransaction: %v", err)
@@ -89,7 +89,7 @@ func TestImmatureSpend(t *testing.T) {
 		tcAsConsensusPointer := &tcAsConsensus
 		consensusReference := consensusreference.NewConsensusReference(&tcAsConsensusPointer)
 		miningManager := miningFactory.NewMiningManager(consensusReference, &consensusConfig.Params, mempool.DefaultConfig(&consensusConfig.Params))
-		tx := createTransactionWithUTXOEntry(t, 0, consensusConfig.GenesisBlock.Header.DAAScore())
+		tx := createTransactionWithUTXOEntry(t, 0)
 		_, err = miningManager.ValidateAndInsertTransaction(tx, false, false)
 		txRuleError := &mempool.TxRuleError{}
 		if !errors.As(err, txRuleError) || txRuleError.RejectCode != mempool.RejectImmatureSpend {
@@ -119,7 +119,7 @@ func TestInsertDoubleTransactionsToMempool(t *testing.T) {
 		tcAsConsensusPointer := &tcAsConsensus
 		consensusReference := consensusreference.NewConsensusReference(&tcAsConsensusPointer)
 		miningManager := miningFactory.NewMiningManager(consensusReference, &consensusConfig.Params, mempool.DefaultConfig(&consensusConfig.Params))
-		transaction := createTransactionWithUTXOEntry(t, 0, 0)
+		transaction := createTransactionWithUTXOEntry(t, 0)
 		_, err = miningManager.ValidateAndInsertTransaction(transaction, false, true)
 		if err != nil {
 			t.Fatalf("ValidateAndInsertTransaction: %v", err)
@@ -186,7 +186,7 @@ func TestHandleNewBlockTransactions(t *testing.T) {
 		miningManager := miningFactory.NewMiningManager(consensusReference, &consensusConfig.Params, mempool.DefaultConfig(&consensusConfig.Params))
 		transactionsToInsert := make([]*externalapi.DomainTransaction, 10)
 		for i := range transactionsToInsert {
-			transaction := createTransactionWithUTXOEntry(t, i, 0)
+			transaction := createTransactionWithUTXOEntry(t, i)
 			transactionsToInsert[i] = transaction
 			_, err = miningManager.ValidateAndInsertTransaction(transaction, false, true)
 			if err != nil {
@@ -253,12 +253,12 @@ func TestDoubleSpendWithBlock(t *testing.T) {
 		tcAsConsensusPointer := &tcAsConsensus
 		consensusReference := consensusreference.NewConsensusReference(&tcAsConsensusPointer)
 		miningManager := miningFactory.NewMiningManager(consensusReference, &consensusConfig.Params, mempool.DefaultConfig(&consensusConfig.Params))
-		transactionInTheMempool := createTransactionWithUTXOEntry(t, 0, 0)
+		transactionInTheMempool := createTransactionWithUTXOEntry(t, 0)
 		_, err = miningManager.ValidateAndInsertTransaction(transactionInTheMempool, false, true)
 		if err != nil {
 			t.Fatalf("ValidateAndInsertTransaction: %v", err)
 		}
-		doubleSpendTransactionInTheBlock := createTransactionWithUTXOEntry(t, 0, 0)
+		doubleSpendTransactionInTheBlock := createTransactionWithUTXOEntry(t, 0)
 		doubleSpendTransactionInTheBlock.Inputs[0].PreviousOutpoint = transactionInTheMempool.Inputs[0].PreviousOutpoint
 		blockTransactions := []*externalapi.DomainTransaction{nil, doubleSpendTransactionInTheBlock}
 		_, err = miningManager.HandleNewBlockTransactions(blockTransactions)
@@ -571,7 +571,7 @@ func TestRevalidateHighPriorityTransactions(t *testing.T) {
 	})
 }
 
-func createTransactionWithUTXOEntry(t *testing.T, i int, daaScore uint64) *externalapi.DomainTransaction {
+func createTransactionWithUTXOEntry(t *testing.T, i int) *externalapi.DomainTransaction {
 	prevOutTxID := externalapi.DomainTransactionID{}
 	prevOutPoint := externalapi.DomainOutpoint{TransactionID: prevOutTxID, Index: uint32(i)}
 	scriptPublicKey, redeemScript := testutils.OpTrueScript()
@@ -587,7 +587,7 @@ func createTransactionWithUTXOEntry(t *testing.T, i int, daaScore uint64) *exter
 			100000000, // 1 KAS
 			scriptPublicKey,
 			true,
-			daaScore),
+			uint64(0)),
 	}
 	txOut := externalapi.DomainTransactionOutput{
 		Value:           10000,

infrastructure/config/config.go

@@ -29,6 +29,7 @@ import (
 
 const (
 	defaultConfigFilename      = "kaspad.conf"
+	defaultDataDirname         = "data"
 	defaultLogLevel            = "info"
 	defaultLogDirname          = "logs"
 	defaultLogFilename         = "kaspad.log"
@@ -85,7 +86,7 @@ type Flags struct {
 	Listeners                       []string      `long:"listen" description:"Add an interface/port to listen for connections (default all interfaces port: 16111, testnet: 16211)"`
 	TargetOutboundPeers             int           `long:"outpeers" description:"Target number of outbound peers"`
 	MaxInboundPeers                 int           `long:"maxinpeers" description:"Max number of inbound peers"`
-	EnableBanning                   bool          `long:"enablebanning" description:"Enable banning of misbehaving peers"`
+	DisableBanning                  bool          `long:"nobanning" description:"Disable banning of misbehaving peers"`
 	BanDuration                     time.Duration `long:"banduration" description:"How long to ban misbehaving peers. Valid time units are {s, m, h}. Minimum 1 second"`
 	BanThreshold                    uint32        `long:"banthreshold" description:"Maximum allowed ban score before disconnecting and banning misbehaving peers."`
 	Whitelists                      []string      `long:"whitelist" description:"Add an IP network or IP that will not be banned. (eg. 192.168.1.0/24 or ::1)"`

infrastructure/config/network.go

@@ -48,7 +48,6 @@ type overrideDAGParamsConfig struct {
 	EnableNonNativeSubnetworks              *bool              `json:"enableNonNativeSubnetworks"`
 	DisableDifficultyAdjustment             *bool              `json:"disableDifficultyAdjustment"`
 	SkipProofOfWork                         *bool              `json:"skipProofOfWork"`
-	HardForkOmitGenesisFromParentsDAAScore  *uint64            `json:"hardForkOmitGenesisFromParentsDaaScore"`
 }
 
 // ResolveNetwork parses the network command line argument and sets NetParams accordingly.

infrastructure/os/limits/limits_unix.go

@@ -2,7 +2,6 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-//go:build !windows && !plan9
 // +build !windows,!plan9
 
 package limits

infrastructure/os/signal/signalsigterm.go

@@ -2,7 +2,6 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package signal

stability-tests/many-tips/main.go

@@ -115,7 +115,6 @@ func startNode() (teardown func(), err error) {
 		"--logdir", dataDir,
 		"--rpclisten", rpcAddress,
 		"--loglevel", "debug",
-		"--allow-submit-block-when-not-synced",
 	)
 	if err != nil {
 		return nil, err

stability-tests/netsync/fast-pruning-ibd-test/fast-pruning-ibd-test-params.json

@@ -1 +1 @@
-{"skipProofOfWork":true, "mergeSetSizeLimit": 30, "finalityDuration": 30000, "hardForkOmitGenesisFromParentsDaaScore": 2505}
+{"skipProofOfWork":true, "mergeSetSizeLimit": 30, "finalityDuration": 30000}

stability-tests/netsync/node.go

@@ -38,7 +38,6 @@ func startNode(name string, rpcAddress, listen, connect, profilePort, dataDir st
 		"--listen", listen,
 		"--profile", profilePort,
 		"--loglevel", "debug",
-		"--allow-submit-block-when-not-synced",
 	}
 	if connect != "" {
 		args = append(args, "--connect", connect)

stability-tests/simple-sync/start-nodes.go

@@ -44,7 +44,6 @@ func startNodes() (teardown func(), err error) {
 		"--rpclisten", syncerRPCAddress,
 		"--listen", syncerListen,
 		"--loglevel", "debug",
-		"--allow-submit-block-when-not-synced",
 	)
 	if err != nil {
 		return nil, err

util/difficulty/difficulty_test.go

@@ -14,7 +14,7 @@ import (
 
 func TestGetHashrateString(t *testing.T) {
 	var results = map[string]string{
-		dagconfig.MainnetParams.Name: "1.53 GH/s",
+		dagconfig.MainnetParams.Name: "131.07 KH/s",
 		dagconfig.TestnetParams.Name: "131.07 KH/s",
 		dagconfig.DevnetParams.Name:  "131.07 KH/s",
 		dagconfig.SimnetParams.Name:  "2.00 KH/s",

version/version.go

@@ -11,7 +11,7 @@ const validCharacters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrs
 const (
 	appMajor uint = 0
 	appMinor uint = 11
-	appPatch uint = 5
+	appPatch uint = 3
 )
 
 // appBuild is defined as a variable so it can be overridden during the build