From f3d76d6565512b39c614c68d2590eb03a44106de Mon Sep 17 00:00:00 2001
From: Ori Newman <orinewman1@gmail.com>
Date: Sat, 11 Dec 2021 20:36:58 +0200
Subject: [PATCH] Ignore header mass in devnet and testnet (#1879)

---
 domain/consensus/factory.go                               | 1 +
 .../processes/blockvalidator/block_body_in_isolation.go   | 4 +++-
 .../consensus/processes/blockvalidator/blockvalidator.go  | 3 +++
 domain/dagconfig/params.go                                | 8 ++++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/domain/consensus/factory.go b/domain/consensus/factory.go
index 3927068d3..f07a32da8 100644
--- a/domain/consensus/factory.go
+++ b/domain/consensus/factory.go
@@ -307,6 +307,7 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas
 		config.MaxBlockParents,
 		config.TimestampDeviationTolerance,
 		config.TargetTimePerBlock,
+		config.IgnoreHeaderMass,
 
 		dbManager,
 		difficultyManager,
diff --git a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go
index 160827977..70b029649 100644
--- a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go
+++ b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go
@@ -220,7 +220,9 @@ func (v *blockValidator) validateGasLimit(block *externalapi.DomainBlock) error
 
 func (v *blockValidator) checkBlockMass(block *externalapi.DomainBlock) error {
 	mass := uint64(0)
-	mass += v.headerEstimatedSerializedSize(block.Header)
+	if !v.ignoreHeaderMass {
+		mass += v.headerEstimatedSerializedSize(block.Header)
+	}
 
 	for _, transaction := range block.Transactions {
 		v.transactionValidator.PopulateMass(transaction)
diff --git a/domain/consensus/processes/blockvalidator/blockvalidator.go b/domain/consensus/processes/blockvalidator/blockvalidator.go
index c39489f05..f34861ef4 100644
--- a/domain/consensus/processes/blockvalidator/blockvalidator.go
+++ b/domain/consensus/processes/blockvalidator/blockvalidator.go
@@ -22,6 +22,7 @@ type blockValidator struct {
 	maxBlockParents             externalapi.KType
 	timestampDeviationTolerance int
 	targetTimePerBlock          time.Duration
+	ignoreHeaderMass            bool
 
 	databaseContext       model.DBReader
 	difficultyManager     model.DifficultyManager
@@ -58,6 +59,7 @@ func New(powMax *big.Int,
 	maxBlockParents externalapi.KType,
 	timestampDeviationTolerance int,
 	targetTimePerBlock time.Duration,
+	ignoreHeaderMass bool,
 
 	databaseContext model.DBReader,
 
@@ -94,6 +96,7 @@ func New(powMax *big.Int,
 		maxBlockMass:               maxBlockMass,
 		mergeSetSizeLimit:          mergeSetSizeLimit,
 		maxBlockParents:            maxBlockParents,
+		ignoreHeaderMass:           ignoreHeaderMass,
 
 		timestampDeviationTolerance: timestampDeviationTolerance,
 		targetTimePerBlock:          targetTimePerBlock,
diff --git a/domain/dagconfig/params.go b/domain/dagconfig/params.go
index 6a11f61c0..45660c7d4 100644
--- a/domain/dagconfig/params.go
+++ b/domain/dagconfig/params.go
@@ -188,6 +188,8 @@ type Params struct {
 	FixedSubsidySwitchHashRateThreshold *big.Int
 
 	DisallowDirectBlocksOnTopOfGenesis bool
+
+	IgnoreHeaderMass bool
 }
 
 // NormalizeRPCServerAddress returns addr with the current network default
@@ -280,11 +282,11 @@ var MainnetParams = Params{
 // TestnetParams defines the network parameters for the test Kaspa network.
 var TestnetParams = Params{
 	K:           defaultGHOSTDAGK,
-	Name:        "kaspa-testnet-6",
+	Name:        "kaspa-testnet-7",
 	Net:         appmessage.Testnet,
 	RPCPort:     "16210",
 	DefaultPort: "16211",
-	DNSSeeds:    []string{"testnet-6-dnsseed.daglabs-dev.com"},
+	DNSSeeds:    []string{"testnet-7-dnsseed.daglabs-dev.com"},
 
 	// DAG parameters
 	GenesisBlock:                    &testnetGenesisBlock,
@@ -337,6 +339,7 @@ var TestnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	IgnoreHeaderMass:                        true,
 }
 
 // SimnetParams defines the network parameters for the simulation test Kaspa
@@ -465,6 +468,7 @@ var DevnetParams = Params{
 	PruningProofM:                           defaultPruningProofM,
 	FixedSubsidySwitchPruningPointInterval:  defaultFixedSubsidySwitchPruningPointInterval,
 	FixedSubsidySwitchHashRateThreshold:     big.NewInt(150_000_000_000),
+	IgnoreHeaderMass:                        true,
 }
 
 var (