From 009b2216921b15962f2612687c1460a8342d49d6 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 22 Apr 2015 23:11:11 +0100 Subject: solidity compiler and contract metadocs integration * common/compiler: solidity compiler + tests * rpc: eth_compilers, eth_compileSolidity + tests * fix natspec test using keystore API, notice exp dynamically changes addr, cleanup * resolver implements registrars and needs to create reg contract (temp) * xeth: solidity compiler. expose getter Solc() and paths setter SetSolc(solcPath) * ethereumApi: implement compiler related RPC calls using XEth - json struct tests * admin: make use of XEth.SetSolc to allow runtime setting of compiler paths * cli: command line flags solc to set custom solc bin path * js admin api with new features debug and contractInfo modules * wiki is the doc https://github.com/ethereum/go-ethereum/wiki/Contracts-and-Transactions --- core/chain_manager.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/chain_manager.go') diff --git a/core/chain_manager.go b/core/chain_manager.go index 0837c85be..0480f692b 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -66,7 +66,6 @@ func CalcGasLimit(parent *types.Block) *big.Int { result := new(big.Int).Add(previous, curInt) result.Div(result, big.NewInt(1024)) - return common.BigMax(params.GenesisGasLimit, result) } @@ -161,7 +160,8 @@ func (self *ChainManager) Td() *big.Int { } func (self *ChainManager) GasLimit() *big.Int { - return self.currentGasLimit + // return self.currentGasLimit + return self.currentBlock.GasLimit() } func (self *ChainManager) LastBlockHash() common.Hash { @@ -280,7 +280,6 @@ func (bc *ChainManager) NewBlock(coinbase common.Address) *types.Block { header.Difficulty = CalcDifficulty(block.Header(), parent.Header()) header.Number = new(big.Int).Add(parent.Header().Number, common.Big1) header.GasLimit = CalcGasLimit(parent) - } return block -- cgit v1.2.3