aboutsummaryrefslogtreecommitdiffstats
path: root/ethpub
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-29 05:23:40 +0800
committerobscuren <geffobscura@gmail.com>2014-05-29 05:23:40 +0800
commit2ef3a989298aa8dca7872be07ad0abbc32728cc7 (patch)
tree967b2e6b8241642af207667c5db7fab00701cd3b /ethpub
parent95adac7522d6041a2d6bf7b2c6b1fd311c4e6e2a (diff)
parent4d987624867fc02a079d8355c28bad620db85f06 (diff)
downloaddexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar.gz
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar.bz2
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar.lz
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar.xz
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.tar.zst
dexon-2ef3a989298aa8dca7872be07ad0abbc32728cc7.zip
Merge branch 'develop'
Diffstat (limited to 'ethpub')
-rw-r--r--ethpub/pub.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/ethpub/pub.go b/ethpub/pub.go
index b75d3abc8..5a9401d0d 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -4,6 +4,7 @@ import (
"encoding/hex"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
+ "strings"
)
type PEthereum struct {
@@ -161,7 +162,17 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, sc
if len(scriptStr) > 0 && scriptStr[0:2] == "0x" {
scriptStr = scriptStr[2:len(scriptStr)]
}
- tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, ethutil.FromHex(scriptStr))
+
+ data := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
+ slice := strings.Split(s, "\n")
+ for _, dataItem := range slice {
+ d := ethutil.FormatData(dataItem)
+ ret = append(ret, d...)
+ }
+ return
+ })
+
+ tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, data)
}
acc := lib.stateManager.TransState().GetStateObject(keyPair.Address())