diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-31 14:00:13 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | c6e94db9e999211c8564969e113d43a907a55835 (patch) | |
| tree | 04171d286c99594ee8eef1d63a3efd2a7d89fca7 /dex | |
| parent | ad92c958334faeba42a3007f29f50c4f253411c1 (diff) | |
| download | dexon-c6e94db9e999211c8564969e113d43a907a55835.tar dexon-c6e94db9e999211c8564969e113d43a907a55835.tar.gz dexon-c6e94db9e999211c8564969e113d43a907a55835.tar.bz2 dexon-c6e94db9e999211c8564969e113d43a907a55835.tar.lz dexon-c6e94db9e999211c8564969e113d43a907a55835.tar.xz dexon-c6e94db9e999211c8564969e113d43a907a55835.tar.zst dexon-c6e94db9e999211c8564969e113d43a907a55835.zip | |
dex: add block gas limit into governance
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/app.go | 9 | ||||
| -rw-r--r-- | dex/governance.go | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/dex/app.go b/dex/app.go index a226aaa0c..b325f44d0 100644 --- a/dex/app.go +++ b/dex/app.go @@ -411,11 +411,10 @@ func (d *DexconApp) BlockDelivered(blockHash coreCommon.Hash, result coreTypes.F } newBlock := types.NewBlock(&types.Header{ - Number: new(big.Int).SetUint64(result.Height), - Time: big.NewInt(result.Timestamp.Unix()), - Coinbase: common.BytesToAddress(block.ProposerID.Bytes()), - // TODO(bojie): fix it - GasLimit: 8000000, + Number: new(big.Int).SetUint64(result.Height), + Time: big.NewInt(result.Timestamp.Unix()), + Coinbase: common.BytesToAddress(block.ProposerID.Bytes()), + GasLimit: d.gov.DexconConfiguration(block.Position.Round).BlockGasLimit, Difficulty: big.NewInt(1), Round: block.Position.Round, DexconMeta: dexconMeta, diff --git a/dex/governance.go b/dex/governance.go index 69c1e217f..bbb34ca50 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -87,12 +87,6 @@ func (d *DexconGovernance) DexconConfiguration(round uint64) *params.DexconConfi // Configuration returns the system configuration for consensus core to use. func (d *DexconGovernance) Configuration(round uint64) *coreTypes.Config { - // Configuration in round r is activiated on round r + 2. - if round < 2 { - round = 0 - } else { - round -= 2 - } s := d.getGovStateAtRound(round) c := s.Configuration() |