diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-23 01:33:24 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-23 01:33:24 +0800 |
| commit | 154ca03228a9d97a4b2319f525814a16f102430f (patch) | |
| tree | a6e71cdafb18f011c2472d4792075173c132bee6 /ethereum | |
| parent | 7855a233a7ed4968d93fc76a74501c931574f6eb (diff) | |
| parent | c7d666ad61a76e79867c9f7ae783a2cc44485dd0 (diff) | |
| download | dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.gz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.bz2 dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.lz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.xz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.zst dexon-154ca03228a9d97a4b2319f525814a16f102430f.zip | |
Merge branch 'release/0.6.5'
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/flags.go | 1 | ||||
| -rw-r--r-- | ethereum/main.go | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ethereum/flags.go b/ethereum/flags.go index 5ed208411..c488e6314 100644 --- a/ethereum/flags.go +++ b/ethereum/flags.go @@ -74,6 +74,7 @@ func Init() { flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0") flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false") + flag.BoolVar(&ShowGenesis, "genesis", false, "Dump the genesis block") flag.BoolVar(&Dump, "dump", false, "output the ethereum state in JSON format. Sub args [number, hash]") flag.StringVar(&DumpHash, "hash", "", "specify arg in hex") diff --git a/ethereum/main.go b/ethereum/main.go index b7c8ea1e7..df9737c1f 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -13,7 +13,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.6.4" + Version = "0.6.5" ) var logger = ethlog.NewLogger("CLI") @@ -40,6 +40,12 @@ func main() { utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile) db := utils.NewDatabase() + err := utils.DBSanityCheck(db) + if err != nil { + logger.Errorln(err) + + os.Exit(1) + } keyManager := utils.NewKeyManager(KeyStore, Datadir, db) @@ -70,6 +76,8 @@ func main() { os.Exit(1) } + fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash()) + // Leave the Println. This needs clean output for piping fmt.Printf("%s\n", block.State().Dump()) |