aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-13 20:52:23 +0800
committerobscuren <geffobscura@gmail.com>2015-03-13 20:52:23 +0800
commite69d5b32e812b21cdaecf0fe7b0188665b05e2ab (patch)
treef133c1350806dc1dc435b2f3dfe88a6d3c6f0a9a /core
parentf76cc6699ecd995d78cfd980b229473101191137 (diff)
downloaddexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar.gz
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar.bz2
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar.lz
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar.xz
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.tar.zst
dexon-e69d5b32e812b21cdaecf0fe7b0188665b05e2ab.zip
Increased genesis gas & gas floor limit to 3141592
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go4
-rw-r--r--core/genesis.go3
2 files changed, 3 insertions, 4 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 97c61395e..df3d6d1c3 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -68,9 +68,7 @@ func CalcGasLimit(parent, block *types.Block) *big.Int {
result := new(big.Int).Add(previous, curInt)
result.Div(result, big.NewInt(1024))
- min := big.NewInt(125000)
-
- return ethutil.BigMax(min, result)
+ return ethutil.BigMax(GenesisGasLimit, result)
}
type ChainManager struct {
diff --git a/core/genesis.go b/core/genesis.go
index a3f5dfb38..a3d701f9f 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -23,11 +23,12 @@ var EmptyShaList = crypto.Sha3(ethutil.Encode([]interface{}{}))
var EmptyListRoot = crypto.Sha3(ethutil.Encode(""))
var GenesisDiff = big.NewInt(131072)
+var GenesisGasLimit = big.NewInt(3141592)
func GenesisBlock(db ethutil.Database) *types.Block {
genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, GenesisDiff, 42, "")
genesis.Header().Number = ethutil.Big0
- genesis.Header().GasLimit = big.NewInt(1000000)
+ genesis.Header().GasLimit = GenesisGasLimit
genesis.Header().GasUsed = ethutil.Big0
genesis.Header().Time = 0
genesis.Header().SeedHash = make([]byte, 32)