aboutsummaryrefslogtreecommitdiffstats
path: root/dex/app.go
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-10-31 14:00:13 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:52 +0800
commit89b4e46f7c319e48425fc0a3af810f66d6778a1e (patch)
tree1bf02bfa8b0c18a7894e953170ef16677d53fc2a /dex/app.go
parent080b562fc0dc529c09b64fb4acc654987d3d1eb6 (diff)
downloaddexon-89b4e46f7c319e48425fc0a3af810f66d6778a1e.tar.gz
dexon-89b4e46f7c319e48425fc0a3af810f66d6778a1e.tar.zst
dexon-89b4e46f7c319e48425fc0a3af810f66d6778a1e.zip
dex: add block gas limit into governance
Diffstat (limited to 'dex/app.go')
-rw-r--r--dex/app.go9
1 files changed, 4 insertions, 5 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,