diff options
author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /core/state_transition.go | |
parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
download | go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.zip |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'core/state_transition.go')
-rw-r--r-- | core/state_transition.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/state_transition.go b/core/state_transition.go index f49aed874..279abee62 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -5,7 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/vm" ) @@ -58,7 +58,7 @@ type Message interface { func AddressFromMessage(msg Message) []byte { // Generate a new address - return crypto.Sha3(ethutil.NewValue([]interface{}{msg.From(), msg.Nonce()}).Encode())[12:] + return crypto.Sha3(common.NewValue([]interface{}{msg.From(), msg.Nonce()}).Encode())[12:] } func MessageCreatesContract(msg Message) bool { @@ -226,9 +226,9 @@ func (self *StateTransition) refundGas() { remaining := new(big.Int).Mul(self.gas, self.msg.GasPrice()) sender.AddBalance(remaining) - uhalf := new(big.Int).Div(self.gasUsed(), ethutil.Big2) + uhalf := new(big.Int).Div(self.gasUsed(), common.Big2) for addr, ref := range self.state.Refunds() { - refund := ethutil.BigMin(uhalf, ref) + refund := common.BigMin(uhalf, ref) self.gas.Add(self.gas, refund) self.state.AddBalance([]byte(addr), refund.Mul(refund, self.msg.GasPrice())) } |