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/transaction_pool.go | |
parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
download | go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.zip |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'core/transaction_pool.go')
-rw-r--r-- | core/transaction_pool.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/transaction_pool.go b/core/transaction_pool.go index bd377f679..515cc2040 100644 --- a/core/transaction_pool.go +++ b/core/transaction_pool.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" ) @@ -113,13 +113,13 @@ func (self *TxPool) add(tx *types.Transaction) error { var to string if len(tx.To()) > 0 { - to = ethutil.Bytes2Hex(tx.To()[:4]) + to = common.Bytes2Hex(tx.To()[:4]) } else { to = "[NEW_CONTRACT]" } var from string if len(tx.From()) > 0 { - from = ethutil.Bytes2Hex(tx.From()[:4]) + from = common.Bytes2Hex(tx.From()[:4]) } else { return errors.New(fmt.Sprintf("FROM ADDRESS MUST BE POSITIVE (was %v)", tx.From())) } |