R4R: apply mirror sync upgrade (#56)
* apply mirror sync upgrade remove 0x update rialto genesis hash update tokenhub code * update tokenhub code * update relayer incentive contract code * update upgrade height and remove mainnet upgrade
This commit is contained in:
parent
b605f1f913
commit
e09e48a02f
@ -135,6 +135,7 @@ type CParamsParams struct {
|
|||||||
ConstantinopleFixForkBlock *math.HexOrDecimal64 `json:"constantinopleFixForkBlock"`
|
ConstantinopleFixForkBlock *math.HexOrDecimal64 `json:"constantinopleFixForkBlock"`
|
||||||
IstanbulBlock *math.HexOrDecimal64 `json:"istanbulForkBlock"`
|
IstanbulBlock *math.HexOrDecimal64 `json:"istanbulForkBlock"`
|
||||||
RamanujanForkBlock *math.HexOrDecimal64 `json:"ramanujanForkBlock"`
|
RamanujanForkBlock *math.HexOrDecimal64 `json:"ramanujanForkBlock"`
|
||||||
|
MirrorSyncForkBlock *math.HexOrDecimal64 `json:"mirrorSyncForkBlock"`
|
||||||
ChainID *math.HexOrDecimal256 `json:"chainID"`
|
ChainID *math.HexOrDecimal256 `json:"chainID"`
|
||||||
MaximumExtraDataSize math.HexOrDecimal64 `json:"maximumExtraDataSize"`
|
MaximumExtraDataSize math.HexOrDecimal64 `json:"maximumExtraDataSize"`
|
||||||
TieBreakingGas bool `json:"tieBreakingGas"`
|
TieBreakingGas bool `json:"tieBreakingGas"`
|
||||||
@ -325,6 +326,7 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa
|
|||||||
petersburgBlock *big.Int
|
petersburgBlock *big.Int
|
||||||
istanbulBlock *big.Int
|
istanbulBlock *big.Int
|
||||||
ramanujanBlock *big.Int
|
ramanujanBlock *big.Int
|
||||||
|
mirrorSyncBlock *big.Int
|
||||||
)
|
)
|
||||||
if chainParams.Params.HomesteadForkBlock != nil {
|
if chainParams.Params.HomesteadForkBlock != nil {
|
||||||
homesteadBlock = big.NewInt(int64(*chainParams.Params.HomesteadForkBlock))
|
homesteadBlock = big.NewInt(int64(*chainParams.Params.HomesteadForkBlock))
|
||||||
@ -357,6 +359,9 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa
|
|||||||
if chainParams.Params.RamanujanForkBlock != nil {
|
if chainParams.Params.RamanujanForkBlock != nil {
|
||||||
ramanujanBlock = big.NewInt(int64(*chainParams.Params.RamanujanForkBlock))
|
ramanujanBlock = big.NewInt(int64(*chainParams.Params.RamanujanForkBlock))
|
||||||
}
|
}
|
||||||
|
if chainParams.Params.MirrorSyncForkBlock != nil {
|
||||||
|
mirrorSyncBlock = big.NewInt(int64(*chainParams.Params.MirrorSyncForkBlock))
|
||||||
|
}
|
||||||
|
|
||||||
genesis := &core.Genesis{
|
genesis := &core.Genesis{
|
||||||
Config: ¶ms.ChainConfig{
|
Config: ¶ms.ChainConfig{
|
||||||
@ -372,6 +377,7 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa
|
|||||||
PetersburgBlock: petersburgBlock,
|
PetersburgBlock: petersburgBlock,
|
||||||
IstanbulBlock: istanbulBlock,
|
IstanbulBlock: istanbulBlock,
|
||||||
RamanujanBlock: ramanujanBlock,
|
RamanujanBlock: ramanujanBlock,
|
||||||
|
MirrorSyncBlock: mirrorSyncBlock,
|
||||||
},
|
},
|
||||||
Nonce: uint64(chainParams.Genesis.Nonce),
|
Nonce: uint64(chainParams.Genesis.Nonce),
|
||||||
Timestamp: uint64(chainParams.Genesis.Timestamp),
|
Timestamp: uint64(chainParams.Genesis.Timestamp),
|
||||||
|
@ -256,6 +256,8 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
|
|||||||
return params.RinkebyChainConfig
|
return params.RinkebyChainConfig
|
||||||
case ghash == params.GoerliGenesisHash:
|
case ghash == params.GoerliGenesisHash:
|
||||||
return params.GoerliChainConfig
|
return params.GoerliChainConfig
|
||||||
|
case ghash == params.BSCGenesisHash:
|
||||||
|
return params.BSCChainConfig
|
||||||
case ghash == params.ChapelGenesisHash:
|
case ghash == params.ChapelGenesisHash:
|
||||||
return params.ChapelChainConfig
|
return params.ChapelChainConfig
|
||||||
case ghash == params.RialtoGenesisHash:
|
case ghash == params.RialtoGenesisHash:
|
||||||
|
File diff suppressed because one or more lines are too long
@ -32,8 +32,9 @@ var (
|
|||||||
RinkebyGenesisHash = common.HexToHash("0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")
|
RinkebyGenesisHash = common.HexToHash("0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")
|
||||||
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
|
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
|
||||||
|
|
||||||
|
BSCGenesisHash = common.HexToHash("0x0d21840abff46b96c84b2ac9e10e4f5cdaeb5693cb665db62a2f3b02d2d57b5b")
|
||||||
ChapelGenesisHash = common.HexToHash("0x6d3c66c5357ec91d5c43af47e234a939b22557cbb552dc45bebbceeed90fbe34")
|
ChapelGenesisHash = common.HexToHash("0x6d3c66c5357ec91d5c43af47e234a939b22557cbb552dc45bebbceeed90fbe34")
|
||||||
RialtoGenesisHash = common.HexToHash("0xaa1c1e0af675e846942719466ab72822eff51ebf8462ead0897ae1240e3c0da1")
|
RialtoGenesisHash = common.HexToHash("0x005dc005bddd1967de6187c1c23be801eb7abdd80cebcc24f341b727b70311d6")
|
||||||
)
|
)
|
||||||
|
|
||||||
// TrustedCheckpoints associates each known checkpoint with the genesis hash of
|
// TrustedCheckpoints associates each known checkpoint with the genesis hash of
|
||||||
@ -213,6 +214,26 @@ var (
|
|||||||
Threshold: 2,
|
Threshold: 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BSCChainConfig = &ChainConfig{
|
||||||
|
ChainID: big.NewInt(56),
|
||||||
|
HomesteadBlock: big.NewInt(0),
|
||||||
|
EIP150Block: big.NewInt(0),
|
||||||
|
EIP155Block: big.NewInt(0),
|
||||||
|
EIP158Block: big.NewInt(0),
|
||||||
|
ByzantiumBlock: big.NewInt(0),
|
||||||
|
ConstantinopleBlock: big.NewInt(0),
|
||||||
|
PetersburgBlock: big.NewInt(0),
|
||||||
|
IstanbulBlock: big.NewInt(0),
|
||||||
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
|
RamanujanBlock: big.NewInt(0),
|
||||||
|
NielsBlock: big.NewInt(0),
|
||||||
|
MirrorSyncBlock: big.NewInt(0),
|
||||||
|
Parlia: &ParliaConfig{
|
||||||
|
Period: 3,
|
||||||
|
Epoch: 200,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
ChapelChainConfig = &ChainConfig{
|
ChapelChainConfig = &ChainConfig{
|
||||||
ChainID: big.NewInt(97),
|
ChainID: big.NewInt(97),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
@ -226,6 +247,7 @@ var (
|
|||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
RamanujanBlock: big.NewInt(1010000),
|
RamanujanBlock: big.NewInt(1010000),
|
||||||
NielsBlock: big.NewInt(1014369),
|
NielsBlock: big.NewInt(1014369),
|
||||||
|
MirrorSyncBlock: big.NewInt(5582500),
|
||||||
Parlia: &ParliaConfig{
|
Parlia: &ParliaConfig{
|
||||||
Period: 3,
|
Period: 3,
|
||||||
Epoch: 200,
|
Epoch: 200,
|
||||||
@ -245,6 +267,7 @@ var (
|
|||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
RamanujanBlock: big.NewInt(400),
|
RamanujanBlock: big.NewInt(400),
|
||||||
NielsBlock: big.NewInt(0),
|
NielsBlock: big.NewInt(0),
|
||||||
|
MirrorSyncBlock: big.NewInt(400),
|
||||||
Parlia: &ParliaConfig{
|
Parlia: &ParliaConfig{
|
||||||
Period: 3,
|
Period: 3,
|
||||||
Epoch: 200,
|
Epoch: 200,
|
||||||
@ -256,16 +279,16 @@ var (
|
|||||||
//
|
//
|
||||||
// This configuration is intentionally not using keyed fields to force anyone
|
// This configuration is intentionally not using keyed fields to force anyone
|
||||||
// adding flags to the config to also have to set these fields.
|
// adding flags to the config to also have to set these fields.
|
||||||
AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, new(EthashConfig), nil, nil}
|
AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, new(EthashConfig), nil, nil}
|
||||||
|
|
||||||
// AllCliqueProtocolChanges contains every protocol change (EIPs) introduced
|
// AllCliqueProtocolChanges contains every protocol change (EIPs) introduced
|
||||||
// and accepted by the Ethereum core developers into the Clique consensus.
|
// and accepted by the Ethereum core developers into the Clique consensus.
|
||||||
//
|
//
|
||||||
// This configuration is intentionally not using keyed fields to force anyone
|
// This configuration is intentionally not using keyed fields to force anyone
|
||||||
// adding flags to the config to also have to set these fields.
|
// adding flags to the config to also have to set these fields.
|
||||||
AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, nil}
|
AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, nil}
|
||||||
|
|
||||||
TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, new(EthashConfig), nil, nil}
|
TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, nil, new(EthashConfig), nil, nil}
|
||||||
TestRules = TestChainConfig.Rules(new(big.Int))
|
TestRules = TestChainConfig.Rules(new(big.Int))
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -339,6 +362,7 @@ type ChainConfig struct {
|
|||||||
EWASMBlock *big.Int `json:"ewasmBlock,omitempty" toml:",omitempty"` // EWASM switch block (nil = no fork, 0 = already activated)
|
EWASMBlock *big.Int `json:"ewasmBlock,omitempty" toml:",omitempty"` // EWASM switch block (nil = no fork, 0 = already activated)
|
||||||
RamanujanBlock *big.Int `json:"ramanujanBlock,omitempty" toml:",omitempty"` // ramanujanBlock switch block (nil = no fork, 0 = already activated)
|
RamanujanBlock *big.Int `json:"ramanujanBlock,omitempty" toml:",omitempty"` // ramanujanBlock switch block (nil = no fork, 0 = already activated)
|
||||||
NielsBlock *big.Int `json:"nielsBlock,omitempty" toml:",omitempty"` // nielsBlock switch block (nil = no fork, 0 = already activated)
|
NielsBlock *big.Int `json:"nielsBlock,omitempty" toml:",omitempty"` // nielsBlock switch block (nil = no fork, 0 = already activated)
|
||||||
|
MirrorSyncBlock *big.Int `json:"mirrorSyncBlock,omitempty" toml:",omitempty"` // mirrorSyncBlock switch block (nil = no fork, 0 = already activated)
|
||||||
|
|
||||||
// Various consensus engines
|
// Various consensus engines
|
||||||
Ethash *EthashConfig `json:"ethash,omitempty" toml:",omitempty"`
|
Ethash *EthashConfig `json:"ethash,omitempty" toml:",omitempty"`
|
||||||
@ -389,7 +413,7 @@ func (c *ChainConfig) String() string {
|
|||||||
default:
|
default:
|
||||||
engine = "unknown"
|
engine = "unknown"
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Ramanujan: %v, Niels: %v, Engine: %v}",
|
return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Ramanujan: %v, Niels: %v, MirrorSync: %v, Engine: %v}",
|
||||||
c.ChainID,
|
c.ChainID,
|
||||||
c.HomesteadBlock,
|
c.HomesteadBlock,
|
||||||
c.DAOForkBlock,
|
c.DAOForkBlock,
|
||||||
@ -404,6 +428,7 @@ func (c *ChainConfig) String() string {
|
|||||||
c.MuirGlacierBlock,
|
c.MuirGlacierBlock,
|
||||||
c.RamanujanBlock,
|
c.RamanujanBlock,
|
||||||
c.NielsBlock,
|
c.NielsBlock,
|
||||||
|
c.MirrorSyncBlock,
|
||||||
engine,
|
engine,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -463,6 +488,17 @@ func (c *ChainConfig) IsOnNiels(num *big.Int) bool {
|
|||||||
return configNumEqual(c.NielsBlock, num)
|
return configNumEqual(c.NielsBlock, num)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsMirrorSync returns whether num is either equal to the MirrorSync fork block or greater.
|
||||||
|
func (c *ChainConfig) IsMirrorSync(num *big.Int) bool {
|
||||||
|
return isForked(c.MirrorSyncBlock, num)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsOnMirrorSync returns whether num is equal to the MirrorSync fork block
|
||||||
|
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.
|
// 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 {
|
func (c *ChainConfig) IsMuirGlacier(num *big.Int) bool {
|
||||||
return isForked(c.MuirGlacierBlock, num)
|
return isForked(c.MuirGlacierBlock, num)
|
||||||
@ -522,6 +558,7 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
|
|||||||
{"istanbulBlock", c.IstanbulBlock},
|
{"istanbulBlock", c.IstanbulBlock},
|
||||||
{"muirGlacierBlock", c.MuirGlacierBlock},
|
{"muirGlacierBlock", c.MuirGlacierBlock},
|
||||||
{"ramanujanBlock", c.RamanujanBlock},
|
{"ramanujanBlock", c.RamanujanBlock},
|
||||||
|
{"mirrorSyncBlock", c.MirrorSyncBlock},
|
||||||
} {
|
} {
|
||||||
if lastFork.name != "" {
|
if lastFork.name != "" {
|
||||||
// Next one must be higher number
|
// Next one must be higher number
|
||||||
@ -584,6 +621,9 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int) *Confi
|
|||||||
if isForkIncompatible(c.RamanujanBlock, newcfg.RamanujanBlock, head) {
|
if isForkIncompatible(c.RamanujanBlock, newcfg.RamanujanBlock, head) {
|
||||||
return newCompatError("ramanujan fork block", c.RamanujanBlock, newcfg.RamanujanBlock)
|
return newCompatError("ramanujan fork block", c.RamanujanBlock, newcfg.RamanujanBlock)
|
||||||
}
|
}
|
||||||
|
if isForkIncompatible(c.MirrorSyncBlock, newcfg.MirrorSyncBlock, head) {
|
||||||
|
return newCompatError("mirrorSync fork block", c.MirrorSyncBlock, newcfg.MirrorSyncBlock)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user