diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-29 05:16:54 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-29 05:16:54 +0800 |
| commit | 4d987624867fc02a079d8355c28bad620db85f06 (patch) | |
| tree | 967b2e6b8241642af207667c5db7fab00701cd3b /ethpub | |
| parent | 73a42d34a5a58a634fd778858287a55a6af7537e (diff) | |
| download | dexon-4d987624867fc02a079d8355c28bad620db85f06.tar dexon-4d987624867fc02a079d8355c28bad620db85f06.tar.gz dexon-4d987624867fc02a079d8355c28bad620db85f06.tar.bz2 dexon-4d987624867fc02a079d8355c28bad620db85f06.tar.lz dexon-4d987624867fc02a079d8355c28bad620db85f06.tar.xz dexon-4d987624867fc02a079d8355c28bad620db85f06.tar.zst dexon-4d987624867fc02a079d8355c28bad620db85f06.zip | |
Fixed state object gas return
Diffstat (limited to 'ethpub')
| -rw-r--r-- | ethpub/pub.go | 13 |
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()) |