diff options
author | zelig <viktor.tron@gmail.com> | 2015-04-23 06:11:11 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2015-05-07 18:58:21 +0800 |
commit | 009b2216921b15962f2612687c1460a8342d49d6 (patch) | |
tree | 4adbbaccdb83a3ea55034f1681d01132452ff48d /cmd/geth/main.go | |
parent | 97c37356fdcfac8b704c3d75b33e322a737c4e55 (diff) | |
download | dexon-009b2216921b15962f2612687c1460a8342d49d6.tar dexon-009b2216921b15962f2612687c1460a8342d49d6.tar.gz dexon-009b2216921b15962f2612687c1460a8342d49d6.tar.bz2 dexon-009b2216921b15962f2612687c1460a8342d49d6.tar.lz dexon-009b2216921b15962f2612687c1460a8342d49d6.tar.xz dexon-009b2216921b15962f2612687c1460a8342d49d6.tar.zst dexon-009b2216921b15962f2612687c1460a8342d49d6.zip |
solidity compiler and contract metadocs integration
* common/compiler: solidity compiler + tests
* rpc: eth_compilers, eth_compileSolidity + tests
* fix natspec test using keystore API, notice exp dynamically changes addr, cleanup
* resolver implements registrars and needs to create reg contract (temp)
* xeth: solidity compiler. expose getter Solc() and paths setter SetSolc(solcPath)
* ethereumApi: implement compiler related RPC calls using XEth - json struct tests
* admin: make use of XEth.SetSolc to allow runtime setting of compiler paths
* cli: command line flags solc to set custom solc bin path
* js admin api with new features debug and contractInfo modules
* wiki is the doc https://github.com/ethereum/go-ethereum/wiki/Contracts-and-Transactions
Diffstat (limited to 'cmd/geth/main.go')
-rw-r--r-- | cmd/geth/main.go | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 92c3b7a90..ff51e8423 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -265,6 +265,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.LogJSONFlag, utils.PProfEanbledFlag, utils.PProfPortFlag, + utils.SolcPathFlag, } app.Before = func(ctx *cli.Context) error { if ctx.GlobalBool(utils.PProfEanbledFlag.Name) { @@ -320,7 +321,14 @@ func console(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), true, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) + repl := newJSRE( + ethereum, + ctx.String(utils.JSpathFlag.Name), + ctx.String(utils.SolcPathFlag.Name), + ctx.GlobalString(utils.RPCCORSDomainFlag.Name), + true, + nil, + ) repl.interactive() ethereum.Stop() @@ -335,7 +343,14 @@ func execJSFiles(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), false, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) + repl := newJSRE( + ethereum, + ctx.String(utils.JSpathFlag.Name), + ctx.String(utils.SolcPathFlag.Name), + ctx.GlobalString(utils.RPCCORSDomainFlag.Name), + false, + nil, + ) for _, file := range ctx.Args() { repl.exec(file) } @@ -362,6 +377,7 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (pass func startEth(ctx *cli.Context, eth *eth.Ethereum) { // Start Ethereum itself + utils.StartEthereum(eth) am := eth.AccountManager() |