aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-04-01 19:18:42 +0800
committerMaran <maran.hidskes@gmail.com>2014-04-01 19:18:42 +0800
commitee5e7f2b350202ed2d2e64265d18d0462bd21c91 (patch)
tree8ea2a6305d58e8d56b16e9869850961b61b7d25c /ethereum
parenta30f5730b384bf99d23f6e83b356e27a14f961d1 (diff)
parente403b28eea6959c1d0ed003d955df3dee586083b (diff)
downloadgo-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz
go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst
go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip
Fix merge conflict
Diffstat (limited to 'ethereum')
-rw-r--r--ethereum/dev_console.go33
1 files changed, 16 insertions, 17 deletions
diff --git a/ethereum/dev_console.go b/ethereum/dev_console.go
index ead4b55e5..421c3fa60 100644
--- a/ethereum/dev_console.go
+++ b/ethereum/dev_console.go
@@ -11,6 +11,7 @@ import (
"github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
+ "github.com/obscuren/mutan"
_ "math/big"
"os"
"strings"
@@ -52,15 +53,15 @@ func (i *Console) ValidateInput(action string, argumentLength int) error {
case action == "gettx" && argumentLength != 1:
err = true
expArgCount = 1
- case action == "tx" && argumentLength != 2:
+ case action == "tx" && argumentLength != 4:
err = true
- expArgCount = 2
+ expArgCount = 4
case action == "getaddr" && argumentLength != 1:
err = true
expArgCount = 1
- case action == "contract" && argumentLength != 1:
+ case action == "contract" && argumentLength != 2:
err = true
- expArgCount = 1
+ expArgCount = 2
case action == "say" && argumentLength != 1:
err = true
expArgCount = 1
@@ -79,7 +80,7 @@ func (i *Console) ValidateInput(action string, argumentLength int) error {
}
}
-func (i *Console) Editor() []string {
+func (i *Console) Editor() string {
var buff bytes.Buffer
for {
reader := bufio.NewReader(os.Stdin)
@@ -94,15 +95,7 @@ func (i *Console) Editor() []string {
}
}
- scanner := bufio.NewScanner(strings.NewReader(buff.String()))
- scanner.Split(bufio.ScanLines)
-
- var lines []string
- for scanner.Scan() {
- lines = append(lines, scanner.Text())
- }
-
- return lines
+ return buff.String()
}
func (i *Console) PrintRoot() {
@@ -178,7 +171,7 @@ func (i *Console) ParseInput(input string) bool {
if err != nil {
fmt.Println("recipient err:", err)
} else {
- tx := ethchain.NewTransaction(recipient, ethutil.Big(tokens[2]), []string{""})
+ tx := ethchain.NewTransactionMessage(recipient, ethutil.Big(tokens[2]), ethutil.Big(tokens[3]), ethutil.Big(tokens[4]), []string{""})
key := ethutil.Config.Db.GetKeys()[0]
tx.Sign(key.PrivateKey)
@@ -197,9 +190,15 @@ func (i *Console) ParseInput(input string) bool {
}
case "contract":
fmt.Println("Contract editor (Ctrl-D = done)")
- code := ethchain.Compile(i.Editor())
+ asm, err := mutan.Compile(strings.NewReader(i.Editor()), false)
+ if err != nil {
+ fmt.Println(err)
+ break
+ }
+
+ code := ethutil.Assemble(asm)
- contract := ethchain.NewTransaction(ethchain.ContractAddr, ethutil.Big(tokens[1]), code)
+ contract := ethchain.NewContractCreationTx(ethutil.Big(tokens[0]), ethutil.Big(tokens[1]), code)
key := ethutil.Config.Db.GetKeys()[0]
contract.Sign(key.PrivateKey)