cmd/evm: add hash to t9n tool

ethereum · Sep 4, 2021 · 4e4d17c · 4e4d17c
1 parent 8d8a21a
commit 4e4d17c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go
@@ -36,20 +36,25 @@ import (
 type result struct {
 	Error   error
 	Address common.Address
+	Hash    common.Hash
 }
 
 // MarshalJSON marshals as JSON with a hash.
 func (r *result) MarshalJSON() ([]byte, error) {
 	type xx struct {
 		Error   string          `json:"error,omitempty"`
 		Address *common.Address `json:"address,omitempty"`
+		Hash    *common.Hash    `json:"hash,omitempty"`
 	}
 	var out xx
+	if r.Error != nil {
+		out.Error = r.Error.Error()
+	}
 	if r.Address != (common.Address{}) {
 		out.Address = &r.Address
 	}
-	if r.Error != nil {
-		out.Error = r.Error.Error()
+	if r.Hash != (common.Hash{}) {
+		out.Hash = &r.Hash
 	}
 	return json.Marshal(out)
 }
@@ -124,7 +129,7 @@ func Transaction(ctx *cli.Context) error {
 			results = append(results, result{Error: err})
 			continue
 		}
-		results = append(results, result{Address: sender})
+		results = append(results, result{Address: sender, Hash: tx.Hash()})
 	}
 	out, err := json.MarshalIndent(results, "", "  ")
 	fmt.Println(string(out))

diff --git a/cmd/evm/testdata/15/exp2.json b/cmd/evm/testdata/15/exp2.json
@@ -1,8 +1,10 @@
 [
   {
-    "address": "0xd02d72e067e77158444ef2020ff2d325f929b363"
+    "address": "0xd02d72e067e77158444ef2020ff2d325f929b363",
+    "hash": "0xa98a24882ea90916c6a86da650fbc6b14238e46f0af04a131ce92be897507476"
   },
   {
-    "address": "0xd02d72e067e77158444ef2020ff2d325f929b363"
+    "address": "0xd02d72e067e77158444ef2020ff2d325f929b363",
+    "hash": "0x36bad80acce7040c45fd32764b5c2b2d2e6f778669fb41791f73f546d56e739a"
   }
 ]