diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-14 19:57:08 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-14 19:57:08 +0800 |
| commit | ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e (patch) | |
| tree | a24053606d175398e2895d4e08e7c5b6f710f66b /ethpub/pub.go | |
| parent | 3ac74b1e7840720e8ae426c751328ed7595188a8 (diff) | |
| parent | f4fa0d48cb10f925908062357be965c54370cba9 (diff) | |
| download | dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar.gz dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar.bz2 dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar.lz dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar.xz dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.tar.zst dexon-ff2cf2dacd3470e7c2800e2f3644cfc05dfa6c4e.zip | |
Merge branch 'develop' of github.com:ethereum/eth-go into develop
Diffstat (limited to 'ethpub/pub.go')
| -rw-r--r-- | ethpub/pub.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ethpub/pub.go b/ethpub/pub.go index 4d1536368..daacb9d78 100644 --- a/ethpub/pub.go +++ b/ethpub/pub.go @@ -39,10 +39,7 @@ func (lib *PEthereum) GetBlock(hexHash string) *PBlock { } func (lib *PEthereum) GetKey() *PKey { - keyPair, err := ethchain.NewKeyPairFromSec(ethutil.Config.Db.GetKeys()[0].PrivateKey) - if err != nil { - return nil - } + keyPair := ethutil.GetKeyRing().Get(0) return NewPKey(keyPair) } @@ -90,7 +87,7 @@ func (lib *PEthereum) IsContract(address string) bool { } func (lib *PEthereum) SecretToAddress(key string) string { - pair, err := ethchain.NewKeyPairFromSec(ethutil.FromHex(key)) + pair, err := ethutil.NewKeyPairFromSec(ethutil.FromHex(key)) if err != nil { return "" } @@ -115,12 +112,12 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in hash = ethutil.FromHex(recipient) } - var keyPair *ethchain.KeyPair + var keyPair *ethutil.KeyPair var err error if key[0:2] == "0x" { - keyPair, err = ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key[0:2]))) + keyPair, err = ethutil.NewKeyPairFromSec([]byte(ethutil.FromHex(key[0:2]))) } else { - keyPair, err = ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key))) + keyPair, err = ethutil.NewKeyPairFromSec([]byte(ethutil.FromHex(key))) } if err != nil { |