diff options
author | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
commit | 76f6d75ef867e754264834fc7171d1a12f24c5bb (patch) | |
tree | a9531d9e14c15abd72625a98a21a9b988dc32319 /core | |
parent | b2a225a52e45315f3ec90e11707fefa6059d13f5 (diff) | |
parent | fa7deb10f636d89f668249b78792f8cc48146ee8 (diff) | |
download | go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.gz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.bz2 go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.lz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.xz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.zst go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.zip |
Merge branch 'master' into hotfix/0.8.5-2
Diffstat (limited to 'core')
-rw-r--r-- | core/block_processor.go | 15 | ||||
-rw-r--r-- | core/chain_manager.go | 1 | ||||
-rw-r--r-- | core/state_transition.go | 9 |
3 files changed, 16 insertions, 9 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index fd591a29d..7eaeb5be0 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -48,9 +48,8 @@ type BlockProcessor struct { func NewBlockProcessor(db ethutil.Database, txpool *TxPool, chainManager *ChainManager, eventMux *event.TypeMux) *BlockProcessor { sm := &BlockProcessor{ - db: db, - mem: make(map[string]*big.Int), - //Pow: ðash.Ethash{}, + db: db, + mem: make(map[string]*big.Int), Pow: ezp.New(), bc: chainManager, eventMux: eventMux, @@ -62,7 +61,7 @@ func NewBlockProcessor(db ethutil.Database, txpool *TxPool, chainManager *ChainM func (sm *BlockProcessor) TransitionState(statedb *state.StateDB, parent, block *types.Block, transientProcess bool) (receipts types.Receipts, err error) { coinbase := statedb.GetOrNewStateObject(block.Header().Coinbase) - coinbase.SetGasPool(CalcGasLimit(parent, block)) + coinbase.SetGasPool(block.Header().GasLimit) // Process the transactions on to parent state receipts, _, _, _, err = sm.ApplyTransactions(coinbase, statedb, block, block.Transactions(), transientProcess) @@ -100,7 +99,8 @@ func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, stated // Notify all subscribers if !transientProcess { go self.eventMux.Post(TxPostEvent{tx}) - go self.eventMux.Post(statedb.Logs()) + logs := statedb.Logs() + go self.eventMux.Post(logs) } return receipt, txGas, err @@ -247,6 +247,11 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error { return fmt.Errorf("Difficulty check failed for block %v, %v", block.Header().Difficulty, expd) } + expl := CalcGasLimit(parent, block) + if expl.Cmp(block.Header().GasLimit) != 0 { + return fmt.Errorf("GasLimit check failed for block %v, %v", block.Header().GasLimit, expl) + } + if block.Time() < parent.Time() { return ValidationError("Block timestamp not after prev block (%v - %v)", block.Header().Time, parent.Header().Time) } diff --git a/core/chain_manager.go b/core/chain_manager.go index 4c7db6e2e..959bfd398 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -283,7 +283,6 @@ func (self *ChainManager) GetBlockHashesFromHash(hash []byte, max uint64) (chain break } } - fmt.Printf("get hash %x (%d)\n", hash, len(chain)) return } diff --git a/core/state_transition.go b/core/state_transition.go index 36ffa23d9..a065c4f6b 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -126,7 +126,7 @@ func (self *StateTransition) BuyGas() error { self.AddGas(self.msg.Gas()) self.initialGas.Set(self.msg.Gas()) - sender.SubAmount(MessageGasValue(self.msg)) + sender.SubBalance(MessageGasValue(self.msg)) return nil } @@ -251,13 +251,16 @@ func (self *StateTransition) RefundGas() { coinbase, sender := self.Coinbase(), self.From() // Return remaining gas remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice()) - sender.AddAmount(remaining) + fmt.Println("REFUND:", remaining) + sender.AddBalance(remaining) uhalf := new(big.Int).Div(self.GasUsed(), ethutil.Big2) for addr, ref := range self.state.Refunds() { refund := ethutil.BigMin(uhalf, ref) self.gas.Add(self.gas, refund) - self.state.AddBalance([]byte(addr), refund.Mul(refund, self.msg.GasPrice())) + addToIt := refund.Mul(refund, self.msg.GasPrice()) + fmt.Println("ADD TO IT", addToIt) + self.state.AddBalance([]byte(addr), addToIt) } coinbase.RefundGas(self.gas, self.msg.GasPrice()) |