state,main: add '--nocode' and '--nostorage' to dump cmd

Author: holiman

cmd/evm/runner.go

@@ -197,7 +197,7 @@ func runCmd(ctx *cli.Context) error {
 
 	if ctx.GlobalBool(DumpFlag.Name) {
 		statedb.IntermediateRoot(true)
-		fmt.Println(string(statedb.Dump()))
+		fmt.Println(string(statedb.Dump(false, false)))
 	}
 
 	if memProfilePath := ctx.GlobalString(MemProfileFlag.Name); memProfilePath != "" {

cmd/evm/staterunner.go

@@ -99,7 +99,7 @@ func stateTestCmd(ctx *cli.Context) error {
 				// Test failed, mark as so and dump any state to aid debugging
 				result.Pass, result.Error = false, err.Error()
 				if ctx.GlobalBool(DumpFlag.Name) && state != nil {
-					dump := state.RawDump()
+					dump := state.RawDump(false, false)
 					result.State = &dump
 				}
 			}

cmd/geth/chaincmd.go

@@ -136,6 +136,8 @@ Remove blockchain and state databases`,
 			utils.CacheFlag,
 			utils.LightModeFlag,
 			utils.IterativeOutputFlag,
+			utils.ExcludeCodeFlag,
+			utils.ExcludeStorageFlag,
 		},
 		Category: "BLOCKCHAIN COMMANDS",
 		Description: `
@@ -387,10 +389,12 @@ func dump(ctx *cli.Context) error {
 			if err != nil {
 				utils.Fatalf("could not create new state: %v", err)
 			}
+			excludeCode := ctx.GlobalIsSet(utils.ExcludeCodeFlag.Name)
+			excludeStorage := ctx.GlobalIsSet(utils.ExcludeStorageFlag.Name)
 			if ctx.GlobalIsSet(utils.IterativeOutputFlag.Name) {
-				state.IterativeDump()
+				state.IterativeDump(excludeCode, excludeStorage)
 			} else {
-				fmt.Printf("%s\n", state.Dump())
+				fmt.Printf("%s\n", state.Dump(excludeCode, excludeStorage))
 			}
 		}
 	}

cmd/geth/main.go

@@ -147,6 +147,8 @@ var (
 
 	dumpFlags = []cli.Flag{
 		utils.IterativeOutputFlag,
+		utils.ExcludeCodeFlag,
+		utils.ExcludeStorageFlag,
 	}
 )
 

cmd/utils/flags.go

@@ -168,6 +168,14 @@ var (
 		Name:  "iterative",
 		Usage: "Print streaming json iteratively as json objects, delimited by lines",
 	}
+	ExcludeStorageFlag = cli.BoolFlag{
+		Name:  "nostorage",
+		Usage: "When dumping state, do not include storage (saves db lookups)",
+	}
+	ExcludeCodeFlag = cli.BoolFlag{
+		Name:  "nocode",
+		Usage: "When dumping state, do not include code (saves db lookups)",
+	}
 	defaultSyncMode = eth.DefaultConfig.SyncMode
 	SyncModeFlag    = TextMarshalerFlag{
 		Name:  "syncmode",

core/state/dump.go

@@ -104,7 +104,7 @@ func (self *IterativeDump) onRoot(root common.Hash) {
 	})
 }
 
-func (self *StateDB) performDump(c collector) {
+func (self *StateDB) performDump(c collector, excludeCode, excludeStorage bool) {
 
 	c.onRoot(self.trie.Hash())
 
@@ -122,29 +122,33 @@ func (self *StateDB) performDump(c collector) {
 			Nonce:    data.Nonce,
 			Root:     common.Bytes2Hex(data.Root[:]),
 			CodeHash: common.Bytes2Hex(data.CodeHash),
-			Code:     common.Bytes2Hex(obj.Code(self.db)),
-			Storage:  make(map[string]string),
 		}
-		storageIt := trie.NewIterator(obj.getTrie(self.db).NodeIterator(nil))
-		for storageIt.Next() {
-			account.Storage[common.Bytes2Hex(self.trie.GetKey(storageIt.Key))] = common.Bytes2Hex(storageIt.Value)
+		if !excludeCode {
+			account.Code = common.Bytes2Hex(obj.Code(self.db))
+		}
+		if !excludeStorage {
+			account.Storage = make(map[string]string)
+			storageIt := trie.NewIterator(obj.getTrie(self.db).NodeIterator(nil))
+			for storageIt.Next() {
+				account.Storage[common.Bytes2Hex(self.trie.GetKey(storageIt.Key))] = common.Bytes2Hex(storageIt.Value)
+			}
 		}
 		c.onAccount(common.Bytes2Hex(addr), account)
 	}
 }
 
 // RawDump returns the entire state an a single large object
-func (self *StateDB) RawDump() Dump {
+func (self *StateDB) RawDump(excludeCode, excludeStorage bool) Dump {
 
 	dump := newCollectingDump()
-	self.performDump(dump)
+	self.performDump(dump, excludeCode, excludeStorage)
 	return *dump
 }
 
 // Dump returns a JSON string representing the entire state as a single json-object
-func (self *StateDB) Dump() []byte {
+func (self *StateDB) Dump(excludeCode, excludeStorage bool) []byte {
 	dump := newCollectingDump()
-	self.performDump(dump)
+	self.performDump(dump, excludeCode, excludeStorage)
 	json, err := json.MarshalIndent(dump, "", "    ")
 	if err != nil {
 		fmt.Println("dump err", err)
@@ -153,6 +157,6 @@ func (self *StateDB) Dump() []byte {
 }
 
 // IterativeDump dumps out accounts as json-objects, delimited by linebreaks on stdout
-func (self *StateDB) IterativeDump() {
-	self.performDump(newIterativeDump(os.Stdout))
+func (self *StateDB) IterativeDump(excludeCode, excludeStorage bool) {
+	self.performDump(newIterativeDump(os.Stdout), excludeCode, excludeStorage)
 }

core/state/state_test.go

@@ -51,7 +51,7 @@ func (s *StateSuite) TestDump(c *checker.C) {
 	s.state.Commit(false)
 
 	// check that dump contains the state objects that are in trie
-	got := string(s.state.Dump())
+	got := string(s.state.Dump(false, false))
 	want := `{
     "root": "71edff0130dd2385947095001c73d9e28d862fc286fca2b922ca6f6f3cddfdd2",
     "accounts": {

eth/api.go

@@ -310,7 +310,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error
 		// both the pending block as well as the pending state from
 		// the miner and operate on those
 		_, stateDb := api.eth.miner.Pending()
-		return stateDb.RawDump(), nil
+		return stateDb.RawDump(false, false), nil
 	}
 	var block *types.Block
 	if blockNr == rpc.LatestBlockNumber {
@@ -325,7 +325,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error
 	if err != nil {
 		return state.Dump{}, err
 	}
-	return stateDb.RawDump(), nil
+	return stateDb.RawDump(false, false), nil
 }
 
 // PrivateDebugAPI is the collection of Ethereum full node APIs exposed over