diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-14 20:04:43 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-14 20:04:43 +0800 |
| commit | c9db87277be495b3567b2831f2f88b8192edb20f (patch) | |
| tree | 3cd3abb22e998fe4ffaf3d3dd3e5571c422d5d69 /ethereal/ui/ui_lib.go | |
| parent | 2c7b625daaf062192db2fa604344f79c1bdbb232 (diff) | |
| parent | f18ec51cb3959cc662bfc7b84314cd1d3b1541b5 (diff) | |
| download | dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar.gz dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar.bz2 dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar.lz dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar.xz dexon-c9db87277be495b3567b2831f2f88b8192edb20f.tar.zst dexon-c9db87277be495b3567b2831f2f88b8192edb20f.zip | |
Fix merge conflicts
Diffstat (limited to 'ethereal/ui/ui_lib.go')
| -rw-r--r-- | ethereal/ui/ui_lib.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 6736e79ae..0c43f1675 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -138,7 +138,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), callerScript, nil) // Contract addr as test address - keyPair := ethutil.Config.Db.GetKeys()[0] + keyPair := ethutil.GetKeyRing().Get(0) account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address()) c := ethchain.MakeContract(callerTx, state) callerClosure := ethchain.NewClosure(account, c, c.Script(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr)) |