modify tx size limit - upgrade9

Author: OPReturnCode

blockchain/process.go

@@ -33,6 +33,11 @@ const (
 	// set.
 	BFMagneticAnomaly
 
+	// BFUpgrade9 signals that the upgrade9 hardfork is
+	// active and the block should be validated according the new rule
+	// set.
+	BFUpgrade9
+
 	// BFNoDupBlockCheck signals if the block should skip existence
 	// checks.
 	BFNoDupBlockCheck
@@ -195,6 +200,10 @@ func (b *BlockChain) ProcessBlock(block *bchutil.Block, flags BehaviorFlags) (bo
 		flags |= BFMagneticAnomaly
 	}
 
+	if block.Height() > b.chainParams.Upgrade9ForkHeight {
+		flags |= BFUpgrade9
+	}
+
 	// Perform preliminary sanity checks on the block and its transactions.
 	err := checkBlockSanity(block, b.chainParams.PowLimit, b.timeSource, flags)
 	if err != nil {

blockchain/validate.go

@@ -53,8 +53,12 @@ const (
 	// after the UAHF hard fork
 	MaxTransactionSize = oneMegabyte
 
-	// MinTransactionSize is the minimum transaction size allowed on the
+	// MagneticAnomalyMinTransactionSize is the minimum transaction size allowed on the
 	// network after the magneticanomaly hardfork
+	MagneticAnomalyMinTransactionSize = 100
+
+	// MinTransactionSize is the minimum transaction size allowed on the
+	// network after the upgrade9 hardfork
 	MinTransactionSize = 65
 
 	// BlockMaxBytesMaxSigChecksRatio is the ratio between the maximum allowable
@@ -235,7 +239,7 @@ func CalcBlockSubsidy(height int32, chainParams *chaincfg.Params) int64 {
 
 // CheckTransactionSanity performs some preliminary checks on a transaction to
 // ensure it is sane.  These checks are context free.
-func CheckTransactionSanity(tx *bchutil.Tx, magneticAnomalyActive bool, scriptFlags txscript.ScriptFlags) error {
+func CheckTransactionSanity(tx *bchutil.Tx, magneticAnomalyActive bool, upgrade9Active bool, scriptFlags txscript.ScriptFlags) error {
 	// A transaction must have at least one input.
 	msgTx := tx.MsgTx()
 	if len(msgTx.TxIn) == 0 {
@@ -255,9 +259,14 @@ func CheckTransactionSanity(tx *bchutil.Tx, magneticAnomalyActive bool, scriptFl
 			"%d, max %d", serializedTxSize, MaxTransactionSize)
 		return ruleError(ErrTxTooBig, str)
 	}
-	if magneticAnomalyActive && serializedTxSize < MinTransactionSize {
+
+	if magneticAnomalyActive && serializedTxSize < MagneticAnomalyMinTransactionSize {
+		minTxSize := MagneticAnomalyMinTransactionSize
+		if upgrade9Active {
+			minTxSize = MinTransactionSize
+		}
 		str := fmt.Sprintf("serialized transaction is too small - got "+
-			"%d, min %d", serializedTxSize, MinTransactionSize)
+			"%d, min %d", serializedTxSize, minTxSize)
 		return ruleError(ErrTxTooSmall, str)
 	}
 
@@ -457,6 +466,8 @@ func checkBlockSanity(block *bchutil.Block, powLimit *big.Int, timeSource Median
 
 	magneticAnomaly := flags.HasFlag(BFMagneticAnomaly)
 
+	upgrade9 := flags.HasFlag(BFUpgrade9)
+
 	// TODO: This is not a full set of ScriptFlags and only
 	// covers the Nov 2018 fork.
 	var scriptFlags txscript.ScriptFlags
@@ -476,7 +487,7 @@ func checkBlockSanity(block *bchutil.Block, powLimit *big.Int, timeSource Median
 			return ruleError(ErrInvalidTxOrder, "transactions are not in lexicographical order")
 		}
 		lastTxid = tx.Hash()
-		err := CheckTransactionSanity(tx, magneticAnomaly, scriptFlags)
+		err := CheckTransactionSanity(tx, magneticAnomaly, upgrade9, scriptFlags)
 		if err != nil {
 			return err
 		}
@@ -516,12 +527,15 @@ func checkBlockSanity(block *bchutil.Block, powLimit *big.Int, timeSource Median
 
 // CheckBlockSanity performs some preliminary checks on a block to ensure it is
 // sane before continuing with block processing.  These checks are context free.
-func CheckBlockSanity(block *bchutil.Block, powLimit *big.Int, timeSource MedianTimeSource, magneticAnomalyActive bool) error {
+func CheckBlockSanity(block *bchutil.Block, powLimit *big.Int, timeSource MedianTimeSource, magneticAnomalyActive bool, upgrade9Active bool) error {
 	behaviorFlags := BFNone
 
 	if magneticAnomalyActive {
 		behaviorFlags |= BFMagneticAnomaly
 	}
+	if upgrade9Active {
+		behaviorFlags |= BFUpgrade9
+	}
 
 	return checkBlockSanity(block, powLimit, timeSource, behaviorFlags)
 }

blockchain/validate_test.go

@@ -211,7 +211,7 @@ func TestCheckBlockSanity(t *testing.T) {
 	powLimit := chaincfg.MainNetParams.PowLimit
 	block := bchutil.NewBlock(&Block100000)
 	timeSource := NewMedianTime()
-	err := CheckBlockSanity(block, powLimit, timeSource, false)
+	err := CheckBlockSanity(block, powLimit, timeSource, false, false)
 	if err != nil {
 		t.Errorf("CheckBlockSanity: %v", err)
 	}
@@ -220,7 +220,7 @@ func TestCheckBlockSanity(t *testing.T) {
 	// second fails.
 	timestamp := block.MsgBlock().Header.Timestamp
 	block.MsgBlock().Header.Timestamp = timestamp.Add(time.Nanosecond)
-	err = CheckBlockSanity(block, powLimit, timeSource, true)
+	err = CheckBlockSanity(block, powLimit, timeSource, true, false)
 	if err == nil {
 		t.Errorf("CheckBlockSanity: error is nil when it shouldn't be")
 	}

chaincfg/params.go

@@ -153,6 +153,7 @@ type Params struct {
 	PhononForkHeight              int32  // May 15, 2020 hardfork
 	AxionActivationHeight         int32  // Nov 15, 2020 hardfork
 	CosmicInflationActivationTime uint64 // May 15, 2022 hardfork
+	Upgrade9ForkHeight            int32  // May 15 2023 hardfork
 
 	// CoinbaseMaturity is the number of blocks required before newly mined
 	// coins (coinbase transactions) can be spent.
@@ -288,6 +289,8 @@ var MainNetParams = Params{
 
 	CosmicInflationActivationTime: 1652616000,
 
+	Upgrade9ForkHeight: 792772, // 000000000000000002B678C471841C3E404EC7AE9CA9C32026FE27EB6E3A1ED1
+
 	CoinbaseMaturity:                     100,
 	SubsidyReductionInterval:             210000,
 	TargetTimespan:                       time.Hour * 24 * 14, // 14 days

mempool/mempool.go

@@ -740,6 +740,10 @@ func (mp *TxPool) maybeAcceptTransaction(tx *bchutil.Tx, isNew, rateLimit, rejec
 	if nextBlockHeight > mp.cfg.ChainParams.MagneticAnonomalyForkHeight {
 		magneticAnomalyActive = true
 	}
+	upgrade9Active := false
+	if nextBlockHeight > mp.cfg.ChainParams.Upgrade9ForkHeight {
+		upgrade9Active = true
+	}
 
 	scriptFlags := txscript.StandardVerifyFlags
 	if !mp.cfg.Policy.LimitSigChecks {
@@ -749,7 +753,7 @@ func (mp *TxPool) maybeAcceptTransaction(tx *bchutil.Tx, isNew, rateLimit, rejec
 	// Perform preliminary sanity checks on the transaction.  This makes
 	// use of blockchain which contains the invariant rules for what
 	// transactions are allowed into blocks.
-	err := blockchain.CheckTransactionSanity(tx, magneticAnomalyActive, scriptFlags)
+	err := blockchain.CheckTransactionSanity(tx, magneticAnomalyActive, upgrade9Active, scriptFlags)
 	if err != nil {
 		if cerr, ok := err.(blockchain.RuleError); ok {
 			return nil, nil, chainRuleError(cerr)

rpcserver.go

@@ -3841,18 +3841,22 @@ func verifyChain(s *rpcServer, level, depth int32) error {
 		}
 
 		magneticAnomalyActive := false
+		upgrade9Active := false
 
 		prevHeight := height - 1
 		if prevHeight > 0 {
 			if height > s.cfg.ChainParams.MagneticAnonomalyForkHeight {
 				magneticAnomalyActive = true
 			}
+			if height > s.cfg.ChainParams.Upgrade9ForkHeight {
+				upgrade9Active = true
+			}
 		}
 
 		// Level 1 does basic chain sanity checks.
 		if level > 0 {
 			err := blockchain.CheckBlockSanity(block,
-				s.cfg.ChainParams.PowLimit, s.cfg.TimeSource, magneticAnomalyActive)
+				s.cfg.ChainParams.PowLimit, s.cfg.TimeSource, magneticAnomalyActive, upgrade9Active)
 			if err != nil {
 				rpcsLog.Errorf("Verify is unable to validate "+
 					"block at hash %v height %d: %v",