Skip to content

Commit

Permalink
[R4R]appay mirror/sync fork to main-net; release for 1.0.6 (#68)
Browse files Browse the repository at this point in the history
* appay mirror/sync fork to main-net; release for 1.0.6

* fix upgrade do not work
  • Loading branch information
unclezoro committed Feb 5, 2021
1 parent 0a1e79e commit 540ac2a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
21 changes: 21 additions & 0 deletions core/systemcontracts/upgrade.go

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down

0 comments on commit 540ac2a

Please sign in to comment.