From 3d61c2bd98c4f22c05585ed5448eb02b87e38869 Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@dexon.org>
Date: Wed, 31 Oct 2018 14:00:13 +0800
Subject: dex: add block gas limit into governance

---
 dex/app.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'dex/app.go')

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,
-- 
cgit v1.2.3