aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-04-23 06:11:11 +0800
committerzelig <viktor.tron@gmail.com>2015-05-07 18:58:21 +0800
commit009b2216921b15962f2612687c1460a8342d49d6 (patch)
tree4adbbaccdb83a3ea55034f1681d01132452ff48d /core
parent97c37356fdcfac8b704c3d75b33e322a737c4e55 (diff)
downloadgo-tangerine-009b2216921b15962f2612687c1460a8342d49d6.tar.gz
go-tangerine-009b2216921b15962f2612687c1460a8342d49d6.tar.zst
go-tangerine-009b2216921b15962f2612687c1460a8342d49d6.zip
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
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go5
-rw-r--r--core/state/state_object.go3
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)
}