Bladeren bron

[R4R]appay mirror/sync fork to main-net; release for 1.0.6 (#68)

* appay mirror/sync fork to main-net; release for 1.0.6

* fix upgrade do not work
zjubfd 4 jaren geleden
bovenliggende
commit
540ac2a1b7
5 gewijzigde bestanden met toevoegingen van 11 en 4 verwijderingen
  1. 2 0
      CHANGELOG.md
  2. 1 1
      core/genesis.go
  3. 6 0
      core/systemcontracts/upgrade.go
  4. 1 2
      params/config.go
  5. 1 1
      params/version.go

+ 2 - 0
CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## v1.0.6
+* [\#68](https://github.com/binance-chain/bsc/pull/68) apply mirror sync upgrade on mainnet
 
 ## v1.0.5
 

+ 1 - 1
core/genesis.go

@@ -226,7 +226,7 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
 	// if we just continued here.
 	// The full node of two BSC testnets may run without genesis file after been inited.
 	if genesis == nil && stored != params.MainnetGenesisHash &&
-		stored != params.ChapelGenesisHash && stored != params.RialtoGenesisHash {
+		stored != params.ChapelGenesisHash && stored != params.RialtoGenesisHash && stored != params.BSCGenesisHash {
 		return storedcfg, stored, nil
 	}
 

File diff suppressed because it is too large
+ 6 - 0
core/systemcontracts/upgrade.go


+ 1 - 2
params/config.go

@@ -227,7 +227,7 @@ var (
 		MuirGlacierBlock:    big.NewInt(0),
 		RamanujanBlock:      big.NewInt(0),
 		NielsBlock:          big.NewInt(0),
-		MirrorSyncBlock:     big.NewInt(0),
+		MirrorSyncBlock:     big.NewInt(5184000),
 		Parlia: &ParliaConfig{
 			Period: 3,
 			Epoch:  200,
@@ -498,7 +498,6 @@ func (c *ChainConfig) IsOnMirrorSync(num *big.Int) bool {
 	return configNumEqual(c.MirrorSyncBlock, num)
 }
 
-
 // IsMuirGlacier returns whether num is either equal to the Muir Glacier (EIP-2384) fork block or greater.
 func (c *ChainConfig) IsMuirGlacier(num *big.Int) bool {
 	return isForked(c.MuirGlacierBlock, num)

+ 1 - 1
params/version.go

@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1  // Major version component of the current release
 	VersionMinor = 0  // Minor version component of the current release
-	VersionPatch = 5  // Patch version component of the current release
+	VersionPatch = 6  // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )
 

Some files were not shown because too many files changed in this diff