Merge branch 'dev/1.2'

params/params.go

@@ -52,10 +52,6 @@ type Checkpoint struct {
 	Hash  *hash.Hash
 }
 
-const (
-	CoinbaseVersionV1 = "0.10.4"
-)
-
 // Params defines a qitmeer network by its parameters.  These parameters may be
 // used by qitmeer applications to differentiate networks as well as addresses
 // and keys for one network from those intended for use on another network.

params/params_mixnet.go

@@ -51,14 +51,7 @@ var MixNetParams = Params{
 		GenesisAmountUnit: 1000 * 1e8,                              // 1000 MEER every utxo
 		MaxLockHeight:     86400 / mixTargetTimePerBlock * 365 * 5, // max lock height
 	},
-	CoinbaseConfig: CoinbaseConfigs{
-		{
-			Height:                    23000,
-			Version:                   CoinbaseVersionV1,
-			ExtraDataIncludedVer:      true,
-			ExtraDataIncludedNodeInfo: true,
-		},
-	},
+	CoinbaseConfig: CoinbaseConfigs{},
 	PowConfig: &pow.PowConfig{
 		Blake2bdPowLimit:             testMixNetPowLimit,
 		Blake2bdPowLimitBits:         0x2003ffff,

params/params_testnet.go

@@ -7,14 +7,15 @@
 package params
 
 import (
+	"math/big"
+	"time"
+
 	"github.com/Qitmeer/qng/common"
 	"github.com/Qitmeer/qng/common/math"
 	"github.com/Qitmeer/qng/core/protocol"
 	"github.com/Qitmeer/qng/core/types"
 	"github.com/Qitmeer/qng/core/types/pow"
 	"github.com/Qitmeer/qng/ledger"
-	"math/big"
-	"time"
 )
 
 // testNetPowLimit is the highest proof of work value a block can
@@ -74,14 +75,7 @@ var TestNetParams = Params{
 		// after this height the big graph will be the main pow graph
 		AdjustmentStartMainHeight: 365 * 1440 * 60 / testTargetTimePerBlock,
 	},
-	CoinbaseConfig: CoinbaseConfigs{
-		{
-			Height:                    61279,
-			Version:                   "0.10.4",
-			ExtraDataIncludedVer:      true,
-			ExtraDataIncludedNodeInfo: true,
-		},
-	},
+	CoinbaseConfig:           CoinbaseConfigs{},
 	ReduceMinDifficulty:      false,
 	MinDiffReductionTime:     0, // Does not apply since ReduceMinDifficulty false
 	GenerateSupported:        true,