diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
| commit | ee5e7f2b350202ed2d2e64265d18d0462bd21c91 (patch) | |
| tree | 8ea2a6305d58e8d56b16e9869850961b61b7d25c /README.md | |
| parent | a30f5730b384bf99d23f6e83b356e27a14f961d1 (diff) | |
| parent | e403b28eea6959c1d0ed003d955df3dee586083b (diff) | |
| download | dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.bz2 dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.lz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.xz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip | |
Fix merge conflict
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -13,18 +13,17 @@ Build ======= 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 -genaddr Generates a new address and private key (destructive action) -p Port on which the server will accept incomming connections (= 30303) -upnp Enable UPnP (= false) -x Desired amount of peers (= 5) -h This help --gui Launch with GUI (= true) -dir Data directory used to store configs and databases (=".ethereum") -import Import a private key (hex) ``` @@ -33,8 +32,9 @@ Developer console commands ========================== ``` -addp <host>:<port> Connect to the given host -tx <addr> <amount> Send <amount> Wei to the specified <addr> +addp <host>:<port> Connect to the given host +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. @@ -57,7 +57,7 @@ Coding standards Sources should be formatted according to the [Go 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. When you comment put meaningfull comments. Describe in detail what you |