roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Proper checks for multiple data items. Fixes #80

Browse Source
This commit is contained in:
obscuren 2014-06-18 11:55:05 +02:00
parent dc9c9369e0
commit 2fbcfd8824
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethpub/pub.go
View File

@ -170,11 +170,6 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, sc
tx = ethchain.NewContractCreationTx(value, gas, gasPrice, script) tx = ethchain.NewContractCreationTx(value, gas, gasPrice, script)
} else { } else {
// Just in case it was submitted as a 0x prefixed string
if len(scriptStr) > 0 && scriptStr[0:2] == "0x" {
scriptStr = scriptStr[2:len(scriptStr)]
}
data := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) { data := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
slice := strings.Split(s, "\n") slice := strings.Split(s, "\n")
for _, dataItem := range slice { for _, dataItem := range slice {

3
ethutil/bytes.go
View File

@ -5,6 +5,7 @@ import (
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"math/big" "math/big"
"strings"
) )
// Number to bytes // Number to bytes
@ -91,7 +92,7 @@ func IsHex(str string) bool {
} }
func StringToByteFunc(str string, cb func(str string) []byte) (ret []byte) { func StringToByteFunc(str string, cb func(str string) []byte) (ret []byte) {
if len(str) > 1 && str[0:2] == "0x" { if len(str) > 1 && str[0:2] == "0x" && !strings.Contains(str, "\n") {
ret = FromHex(str[2:]) ret = FromHex(str[2:])
} else { } else {
ret = cb(str) ret = cb(str)