@@ -22,6 +22,7 @@ import (
2222 "io/ioutil"
2323 "math/big"
2424 "os"
25+ "path"
2526
2627 "github.com/ethereum/go-ethereum/common"
2728 "github.com/ethereum/go-ethereum/core"
@@ -75,11 +76,22 @@ func Main(ctx *cli.Context) error {
7576 log .Root ().SetHandler (glogger )
7677
7778 var (
78- err error
79- tracer vm.Tracer
79+ err error
80+ tracer vm.Tracer
81+ baseDir = ""
8082 )
81- var getTracer func (txIndex int ) (vm.Tracer , error )
83+ var getTracer func (txIndex int , txHash common. Hash ) (vm.Tracer , error )
8284
85+ // If user specified a basedir, make sure it exists
86+ if ctx .IsSet (OutputBasedir .Name ) {
87+ if base := ctx .String (OutputBasedir .Name ); len (base ) > 0 {
88+ err := os .MkdirAll (base , 0755 ) // //rw-r--r--
89+ if err != nil {
90+ return NewError (ErrorIO , fmt .Errorf ("failed creating output basedir: %v" , err ))
91+ }
92+ baseDir = base
93+ }
94+ }
8395 if ctx .Bool (TraceFlag .Name ) {
8496 // Configure the EVM logger
8597 logConfig := & vm.LogConfig {
@@ -95,19 +107,19 @@ func Main(ctx *cli.Context) error {
95107 prevFile .Close ()
96108 }
97109 }()
98- getTracer = func (txIndex int ) (vm.Tracer , error ) {
110+ getTracer = func (txIndex int , txHash common. Hash ) (vm.Tracer , error ) {
99111 if prevFile != nil {
100112 prevFile .Close ()
101113 }
102- traceFile , err := os .Create (fmt .Sprintf ("trace-%d.jsonl" , txIndex ))
114+ traceFile , err := os .Create (path . Join ( baseDir , fmt .Sprintf ("trace-%d-%v .jsonl" , txIndex , txHash . String ()) ))
103115 if err != nil {
104116 return nil , NewError (ErrorIO , fmt .Errorf ("failed creating trace-file: %v" , err ))
105117 }
106118 prevFile = traceFile
107119 return vm .NewJSONLogger (logConfig , traceFile ), nil
108120 }
109121 } else {
110- getTracer = func (txIndex int ) (tracer vm.Tracer , err error ) {
122+ getTracer = func (txIndex int , txHash common. Hash ) (tracer vm.Tracer , err error ) {
111123 return nil , nil
112124 }
113125 }
@@ -197,7 +209,7 @@ func Main(ctx *cli.Context) error {
197209 //postAlloc := state.DumpGenesisFormat(false, false, false)
198210 collector := make (Alloc )
199211 state .DumpToCollector (collector , false , false , false , nil , - 1 )
200- return dispatchOutput (ctx , result , collector )
212+ return dispatchOutput (ctx , baseDir , result , collector )
201213
202214}
203215
@@ -224,39 +236,39 @@ func (g Alloc) OnAccount(addr common.Address, dumpAccount state.DumpAccount) {
224236}
225237
226238// saveFile marshalls the object to the given file
227- func saveFile (filename string , data interface {}) error {
239+ func saveFile (baseDir , filename string , data interface {}) error {
228240 b , err := json .MarshalIndent (data , "" , " " )
229241 if err != nil {
230242 return NewError (ErrorJson , fmt .Errorf ("failed marshalling output: %v" , err ))
231243 }
232- if err = ioutil .WriteFile (filename , b , 0644 ); err != nil {
244+ if err = ioutil .WriteFile (path . Join ( baseDir , filename ) , b , 0644 ); err != nil {
233245 return NewError (ErrorIO , fmt .Errorf ("failed writing output: %v" , err ))
234246 }
235247 return nil
236248}
237249
238250// dispatchOutput writes the output data to either stderr or stdout, or to the specified
239251// files
240- func dispatchOutput (ctx * cli.Context , result * ExecutionResult , alloc Alloc ) error {
252+ func dispatchOutput (ctx * cli.Context , baseDir string , result * ExecutionResult , alloc Alloc ) error {
241253 stdOutObject := make (map [string ]interface {})
242254 stdErrObject := make (map [string ]interface {})
243- dispatch := func (fName , name string , obj interface {}) error {
255+ dispatch := func (baseDir , fName , name string , obj interface {}) error {
244256 switch fName {
245257 case "stdout" :
246258 stdOutObject [name ] = obj
247259 case "stderr" :
248260 stdErrObject [name ] = obj
249261 default : // save to file
250- if err := saveFile (fName , obj ); err != nil {
262+ if err := saveFile (baseDir , fName , obj ); err != nil {
251263 return err
252264 }
253265 }
254266 return nil
255267 }
256- if err := dispatch (ctx .String (OutputAllocFlag .Name ), "alloc" , alloc ); err != nil {
268+ if err := dispatch (baseDir , ctx .String (OutputAllocFlag .Name ), "alloc" , alloc ); err != nil {
257269 return err
258270 }
259- if err := dispatch (ctx .String (OutputResultFlag .Name ), "result" , result ); err != nil {
271+ if err := dispatch (baseDir , ctx .String (OutputResultFlag .Name ), "result" , result ); err != nil {
260272 return err
261273 }
262274 if len (stdOutObject ) > 0 {
0 commit comments