From b0b708bf23238a496bde3f563af1661857942fa2 Mon Sep 17 00:00:00 2001
From: lightclient <14004106+lightclient@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:43:58 -0700
Subject: [PATCH] cmd/evm: add `gasUsed` to t8n `result` (#23919)

* cmd/evm: add gas used accumulator to t8n result

* cmd/evm: update t8n tests to include gas used field
---
 cmd/evm/internal/t8ntool/execution.go     | 2 ++
 cmd/evm/testdata/1/exp.json               | 5 +++--
 cmd/evm/testdata/13/exp2.json             | 3 ++-
 cmd/evm/testdata/14/exp.json              | 5 +++--
 cmd/evm/testdata/14/exp2.json             | 5 +++--
 cmd/evm/testdata/14/exp_berlin.json       | 5 +++--
 cmd/evm/testdata/19/exp_arrowglacier.json | 5 +++--
 cmd/evm/testdata/19/exp_london.json       | 5 +++--
 cmd/evm/testdata/3/exp.json               | 3 ++-
 cmd/evm/testdata/5/exp.json               | 3 ++-
 10 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
index cedf96627..0109b3379 100644
--- a/cmd/evm/internal/t8ntool/execution.go
+++ b/cmd/evm/internal/t8ntool/execution.go
@@ -55,6 +55,7 @@ type ExecutionResult struct {
 	Receipts    types.Receipts        `json:"receipts"`
 	Rejected    []*rejectedTx         `json:"rejected,omitempty"`
 	Difficulty  *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
+	GasUsed     math.HexOrDecimal64   `json:"gasUsed"`
 }
 
 type ommer struct {
@@ -255,6 +256,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		Receipts:    receipts,
 		Rejected:    rejectedTxs,
 		Difficulty:  (*math.HexOrDecimal256)(vmContext.Difficulty),
+		GasUsed:     (math.HexOrDecimal64)(gasUsed),
 	}
 	return statedb, execRs, nil
 }
diff --git a/cmd/evm/testdata/1/exp.json b/cmd/evm/testdata/1/exp.json
index 17d2f8267..896627e49 100644
--- a/cmd/evm/testdata/1/exp.json
+++ b/cmd/evm/testdata/1/exp.json
@@ -38,6 +38,7 @@
         "error": "nonce too low: address 0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192, tx: 0 state: 1"
       }
     ],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x5208"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/13/exp2.json b/cmd/evm/testdata/13/exp2.json
index 01ab59e84..fa5d4157f 100644
--- a/cmd/evm/testdata/13/exp2.json
+++ b/cmd/evm/testdata/13/exp2.json
@@ -33,6 +33,7 @@
         "transactionIndex": "0x1"
       }
     ],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x109a0"
   }
 }
diff --git a/cmd/evm/testdata/14/exp.json b/cmd/evm/testdata/14/exp.json
index bbe6a1317..92e9ea2b6 100644
--- a/cmd/evm/testdata/14/exp.json
+++ b/cmd/evm/testdata/14/exp.json
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000020000000",
-    "receipts": []
+    "receipts": [],
+    "gasUsed": "0x0"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/14/exp2.json b/cmd/evm/testdata/14/exp2.json
index 195c738d9..dba19fa20 100644
--- a/cmd/evm/testdata/14/exp2.json
+++ b/cmd/evm/testdata/14/exp2.json
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
-    "currentDifficulty": "0x1ff8020000000"
+    "currentDifficulty": "0x1ff8020000000",
+    "gasUsed": "0x0"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/14/exp_berlin.json b/cmd/evm/testdata/14/exp_berlin.json
index e56478831..a849e6875 100644
--- a/cmd/evm/testdata/14/exp_berlin.json
+++ b/cmd/evm/testdata/14/exp_berlin.json
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
-    "currentDifficulty": "0x1ff9000000000"
+    "currentDifficulty": "0x1ff9000000000",
+    "gasUsed": "0x0"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/19/exp_arrowglacier.json b/cmd/evm/testdata/19/exp_arrowglacier.json
index 4c5f8e0fb..bc31f7bab 100644
--- a/cmd/evm/testdata/19/exp_arrowglacier.json
+++ b/cmd/evm/testdata/19/exp_arrowglacier.json
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000000200000",
-    "receipts": []
+    "receipts": [],
+    "gasUsed": "0x0"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/19/exp_london.json b/cmd/evm/testdata/19/exp_london.json
index 9dc1b9d4f..60e7cbb9a 100644
--- a/cmd/evm/testdata/19/exp_london.json
+++ b/cmd/evm/testdata/19/exp_london.json
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000080000000",
-    "receipts": []
+    "receipts": [],
+    "gasUsed": "0x0"
   }
-}
\ No newline at end of file
+}
diff --git a/cmd/evm/testdata/3/exp.json b/cmd/evm/testdata/3/exp.json
index ade09e9ac..36b8812c8 100644
--- a/cmd/evm/testdata/3/exp.json
+++ b/cmd/evm/testdata/3/exp.json
@@ -32,6 +32,7 @@
         "transactionIndex": "0x0"
       }
     ],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x521f"
   }
 }
diff --git a/cmd/evm/testdata/5/exp.json b/cmd/evm/testdata/5/exp.json
index 6340d4cc3..d521ee815 100644
--- a/cmd/evm/testdata/5/exp.json
+++ b/cmd/evm/testdata/5/exp.json
@@ -17,6 +17,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x0"
   }
 }