aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-04-23 06:11:11 +0800
committerzelig <viktor.tron@gmail.com>2015-05-07 18:58:21 +0800
commit009b2216921b15962f2612687c1460a8342d49d6 (patch)
tree4adbbaccdb83a3ea55034f1681d01132452ff48d /cmd/utils
parent97c37356fdcfac8b704c3d75b33e322a737c4e55 (diff)
downloaddexon-009b2216921b15962f2612687c1460a8342d49d6.tar.gz
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/utils')
-rw-r--r--cmd/utils/cmd.go13
-rw-r--r--cmd/utils/flags.go7
2 files changed, 9 insertions, 11 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index cbb2d42aa..b21099162 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -95,19 +95,10 @@ func initDataDir(Datadir string) {
}
}
-func exit(err error) {
- status := 0
- if err != nil {
- fmt.Fprintln(os.Stderr, "Fatal:", err)
- status = 1
- }
- logger.Flush()
- os.Exit(status)
-}
-
// Fatalf formats a message to standard output and exits the program.
func Fatalf(format string, args ...interface{}) {
fmt.Fprintf(os.Stderr, "Fatal: "+format+"\n", args...)
+ fmt.Fprintf(os.Stdout, "Fatal: "+format+"\n", args...)
logger.Flush()
os.Exit(1)
}
@@ -115,7 +106,7 @@ func Fatalf(format string, args ...interface{}) {
func StartEthereum(ethereum *eth.Ethereum) {
glog.V(logger.Info).Infoln("Starting ", ethereum.Name())
if err := ethereum.Start(); err != nil {
- exit(err)
+ Fatalf("Error starting Ethereum: %v", err)
}
RegisterInterrupt(func(sig os.Signal) {
ethereum.Stop()
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 1fdc8dfe5..460068d91 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -224,11 +224,17 @@ var (
Name: "shh",
Usage: "Enable whisper",
}
+ // ATM the url is left to the user and deployment to
JSpathFlag = cli.StringFlag{
Name: "jspath",
Usage: "JS library path to be used with console and js subcommands",
Value: ".",
}
+ SolcPathFlag = cli.StringFlag{
+ Name: "solc",
+ Usage: "solidity compiler to be used",
+ Value: "solc",
+ }
)
func GetNAT(ctx *cli.Context) nat.Interface {
@@ -294,6 +300,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
Dial: true,
BootNodes: ctx.GlobalString(BootnodesFlag.Name),
}
+
}
func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Database) {