Compare commits
10 Commits
fusion-aud
...
bc-fusion-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
880667e77f | ||
|
|
f599fee78c | ||
|
|
eb93010928 | ||
|
|
d94cb56ae9 | ||
|
|
0438b61114 | ||
|
|
c73b11055e | ||
|
|
54f334a95f | ||
|
|
f2e38fec9a | ||
|
|
d1118313ce | ||
|
|
288b4f9926 |
@@ -1178,7 +1178,7 @@ func (p *Parlia) Finalize(chain consensus.ChainHeaderReader, header *types.Heade
|
|||||||
if p.chainConfig.IsFeynman(header.Number, header.Time) {
|
if p.chainConfig.IsFeynman(header.Number, header.Time) {
|
||||||
// TODO: revert this
|
// TODO: revert this
|
||||||
// if time.Unix(int64(parent.Time), 0).Day() < time.Unix(int64(header.Time), 0).Day() {
|
// if time.Unix(int64(parent.Time), 0).Day() < time.Unix(int64(header.Time), 0).Day() {
|
||||||
if time.Unix(int64(header.Time), 0).Minute() > time.Unix(int64(parent.Time), 0).Minute() {
|
if time.Unix(int64(header.Time), 0).Minute() != time.Unix(int64(parent.Time), 0).Minute() {
|
||||||
if err := p.updateValidatorSetV2(state, header, cx, txs, receipts, systemTxs, usedGas, false); err != nil {
|
if err := p.updateValidatorSetV2(state, header, cx, txs, receipts, systemTxs, usedGas, false); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -1262,7 +1262,7 @@ func (p *Parlia) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
|
|||||||
if p.chainConfig.IsFeynman(header.Number, header.Time) {
|
if p.chainConfig.IsFeynman(header.Number, header.Time) {
|
||||||
// TODO: revert this
|
// TODO: revert this
|
||||||
// if time.Unix(int64(parent.Time), 0).Day() < time.Unix(int64(header.Time), 0).Day() {
|
// if time.Unix(int64(parent.Time), 0).Day() < time.Unix(int64(header.Time), 0).Day() {
|
||||||
if time.Unix(int64(header.Time), 0).Minute() > time.Unix(int64(parent.Time), 0).Minute() {
|
if time.Unix(int64(header.Time), 0).Minute() != time.Unix(int64(parent.Time), 0).Minute() {
|
||||||
if err := p.updateValidatorSetV2(state, header, cx, &txs, &receipts, nil, &header.GasUsed, true); err != nil {
|
if err := p.updateValidatorSetV2(state, header, cx, &txs, &receipts, nil, &header.GasUsed, true); err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -218,7 +218,7 @@ var (
|
|||||||
}
|
}
|
||||||
|
|
||||||
RialtoChainConfig = &ChainConfig{
|
RialtoChainConfig = &ChainConfig{
|
||||||
ChainID: big.NewInt(1417),
|
ChainID: big.NewInt(714),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
EIP150Block: big.NewInt(0),
|
EIP150Block: big.NewInt(0),
|
||||||
EIP155Block: big.NewInt(0),
|
EIP155Block: big.NewInt(0),
|
||||||
@@ -228,23 +228,26 @@ var (
|
|||||||
PetersburgBlock: big.NewInt(0),
|
PetersburgBlock: big.NewInt(0),
|
||||||
IstanbulBlock: big.NewInt(0),
|
IstanbulBlock: big.NewInt(0),
|
||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
RamanujanBlock: big.NewInt(400),
|
RamanujanBlock: big.NewInt(0),
|
||||||
NielsBlock: big.NewInt(0),
|
NielsBlock: big.NewInt(0),
|
||||||
MirrorSyncBlock: big.NewInt(400),
|
MirrorSyncBlock: big.NewInt(1),
|
||||||
BrunoBlock: big.NewInt(400),
|
BrunoBlock: big.NewInt(1),
|
||||||
EulerBlock: big.NewInt(400),
|
EulerBlock: big.NewInt(2),
|
||||||
GibbsBlock: big.NewInt(400),
|
GibbsBlock: big.NewInt(3),
|
||||||
NanoBlock: nil,
|
NanoBlock: nil,
|
||||||
MoranBlock: nil,
|
MoranBlock: big.NewInt(4),
|
||||||
PlanckBlock: nil,
|
PlanckBlock: big.NewInt(5),
|
||||||
LubanBlock: nil,
|
LubanBlock: big.NewInt(6),
|
||||||
PlatoBlock: nil,
|
PlatoBlock: big.NewInt(7),
|
||||||
BerlinBlock: nil,
|
BerlinBlock: _hertz_upgrade_block_,
|
||||||
HertzBlock: nil,
|
LondonBlock: _hertz_upgrade_block_,
|
||||||
HertzfixBlock: nil,
|
HertzBlock: _hertz_upgrade_block_,
|
||||||
|
HertzfixBlock: _hertz_upgrade_block_,
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
FeynmanTime: nil,
|
ShanghaiTime: _rialto_upgrade_height_,
|
||||||
|
KeplerTime: _rialto_upgrade_height_,
|
||||||
|
FeynmanTime: _rialto_upgrade_height_,
|
||||||
|
|
||||||
Parlia: &ParliaConfig{
|
Parlia: &ParliaConfig{
|
||||||
Period: 3,
|
Period: 3,
|
||||||
|
|||||||
Reference in New Issue
Block a user