Updated to new mutan api

This commit is contained in:
obscuren 2014-03-30 22:03:29 +02:00
parent 3fb7ae2fa1
commit ebbc5e7cb8
3 changed files with 8 additions and 8 deletions

View File

@ -13,18 +13,17 @@ Build
======= =======
For build instruction please see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)) For build instruction please see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go))
Command line options General command line options
==================== ====================
``` ```
-c Launch the developer console -c Launch the developer console (node only)
-m Start mining blocks -m Start mining blocks
-genaddr Generates a new address and private key (destructive action) -genaddr Generates a new address and private key (destructive action)
-p Port on which the server will accept incomming connections (= 30303) -p Port on which the server will accept incomming connections (= 30303)
-upnp Enable UPnP (= false) -upnp Enable UPnP (= false)
-x Desired amount of peers (= 5) -x Desired amount of peers (= 5)
-h This help -h This help
-gui Launch with GUI (= true)
-dir Data directory used to store configs and databases (=".ethereum") -dir Data directory used to store configs and databases (=".ethereum")
-import Import a private key (hex) -import Import a private key (hex)
``` ```
@ -33,8 +32,9 @@ Developer console commands
========================== ==========================
``` ```
addp <host>:<port> Connect to the given host addp <host>:<port> Connect to the given host
tx <addr> <amount> Send <amount> Wei to the specified <addr> tx <addr> <amount> Send <amount> Wei to the specified <addr>
contract <value> <gasprice> Creates a new contract and launches the editor
``` ```
See the "help" command for *developer* options. See the "help" command for *developer* options.
@ -57,7 +57,7 @@ Coding standards
Sources should be formatted according to the [Go Formatting Sources should be formatted according to the [Go Formatting
Style](http://golang.org/doc/effective_go.html#formatting). Style](http://golang.org/doc/effective_go.html#formatting).
Unless structs fields are supposed to be directly accesible, provide Unless structs fields are supposed to be directly accessible, provide
Getters and hide the fields through Go's exporting facility. Getters and hide the fields through Go's exporting facility.
When you comment put meaningfull comments. Describe in detail what you When you comment put meaningfull comments. Describe in detail what you

View File

@ -35,7 +35,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
var tx *ethchain.Transaction var tx *ethchain.Transaction
// Compile and assemble the given data // Compile and assemble the given data
if contractCreation { if contractCreation {
asm, err := mutan.NewCompiler().Compile(strings.NewReader(data)) asm, err := mutan.Compile(strings.NewReader(data), false)
if err != nil { if err != nil {
return err.Error() return err.Error()
} }

View File

@ -190,7 +190,7 @@ func (i *Console) ParseInput(input string) bool {
} }
case "contract": case "contract":
fmt.Println("Contract editor (Ctrl-D = done)") fmt.Println("Contract editor (Ctrl-D = done)")
asm, err := mutan.NewCompiler().Compile(strings.NewReader(i.Editor())) asm, err := mutan.Compile(strings.NewReader(i.Editor()), false)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
break break