diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-10 08:04:06 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-10 08:04:06 +0800 |
| commit | 3af35d922e5751dcf265d31abf293b759e570fec (patch) | |
| tree | 5dbfdb50177d9c7ededabb240f7e792d1174505b /ethpub | |
| parent | 2096b3a9edb3289a8f30da81704181dec7b39917 (diff) | |
| parent | dbf8645aafb19837d01b939ba9b1d3e1a2fffbf9 (diff) | |
| download | dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar.gz dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar.bz2 dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar.lz dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar.xz dexon-3af35d922e5751dcf265d31abf293b759e570fec.tar.zst dexon-3af35d922e5751dcf265d31abf293b759e570fec.zip | |
Merge branch 'release/poc5-rc2'
Diffstat (limited to 'ethpub')
| -rw-r--r-- | ethpub/pub.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ethpub/pub.go b/ethpub/pub.go index 5e7792a9f..f7e641b35 100644 --- a/ethpub/pub.go +++ b/ethpub/pub.go @@ -92,7 +92,14 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in hash = ethutil.FromHex(recipient) } - keyPair, err := ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key))) + var keyPair *ethchain.KeyPair + var err error + if key[0:2] == "0x" { + keyPair, err = ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key[0:2]))) + } else { + keyPair, err = ethchain.NewKeyPairFromSec([]byte(ethutil.FromHex(key))) + } + if err != nil { return nil, err } @@ -132,8 +139,11 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, ethutil.FromHex(initStr)) } - acc := lib.stateManager.GetAddrState(keyPair.Address()) + acc := lib.stateManager.TransState().GetStateObject(keyPair.Address()) + //acc := lib.stateManager.GetAddrState(keyPair.Address()) tx.Nonce = acc.Nonce + lib.stateManager.TransState().SetStateObject(acc) + tx.Sign(keyPair.PrivateKey) lib.txPool.QueueTransaction(tx) |