Merge pull request #833 from ethersphere/frontier/solidity

solidity compiler and contract metadocs integration

2 files changed, 5 insertions, 3 deletions

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
diff --git a/core/state/state_object.go b/core/state/state_object.go
index b8b1972e0..bfc4ebc6c 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -138,9 +138,12 @@ func (c *StateObject) setAddr(addr []byte, value interface{}) {
 }
 
 func (self *StateObject) GetStorage(key *big.Int) *common.Value {
+	fmt.Printf("%v: get %v %v", self.address.Hex(), key)
 	return self.GetState(common.BytesToHash(key.Bytes()))
 }
+
 func (self *StateObject) SetStorage(key *big.Int, value *common.Value) {
+	fmt.Printf("%v: set %v -> %v", self.address.Hex(), key, value)
 	self.SetState(common.BytesToHash(key.Bytes()), value)
 }