aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ui
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-04-12 01:26:14 +0800
committerMaran <maran.hidskes@gmail.com>2014-04-12 01:26:14 +0800
commitcf1ae41bc0bedeb5208dc00696c538c13f2183c6 (patch)
treea20a3ba24e1de36f75ffb246c25499e0ebd900a1 /ethereal/ui
parente2bf5d1270b1dc33f308ab134e7e7d3f4f64b7d4 (diff)
downloadgo-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar.gz
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar.bz2
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar.lz
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar.xz
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.tar.zst
go-tangerine-cf1ae41bc0bedeb5208dc00696c538c13f2183c6.zip
Improved (hopefully) the send transaction tab
Diffstat (limited to 'ethereal/ui')
-rw-r--r--ethereal/ui/library.go14
1 files changed, 10 insertions, 4 deletions
diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index b8ecf3b14..d4800bf1d 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -63,15 +63,21 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
var tx *ethchain.Transaction
// Compile and assemble the given data
if contractCreation {
- asm, err := mutan.Compile(strings.NewReader(data), false)
- if err != nil {
- return "", err
+ asm, errors := mutan.Compile(strings.NewReader(data), false)
+ if len(errors) > 0 {
+ var errs string
+ for _, er := range errors {
+ if er != nil {
+ errs += er.Error()
+ }
+ }
+ return "", fmt.Errorf(errs)
}
code := ethutil.Assemble(asm...)
tx = ethchain.NewContractCreationTx(value, gasPrice, code)
} else {
- tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{})
+ tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, nil)
}
acc := lib.stateManager.GetAddrState(keyPair.Address())
tx.Nonce = acc.Nonce