cmd/evm: add gasUsed to t8n result (ethereum#23919)

lightclient · web-flow · commit b0b708bf2323 · 2021-11-16T08:43:58.000+01:00
* cmd/evm: add gas used accumulator to t8n result

* cmd/evm: update t8n tests to include gas used field
diff --git 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
@@ -38,6 +38,7 @@
         "error": "nonce too low: address 0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192, tx: 0 state: 1"
       }
     ],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x5208"
   }
-}
+}
diff --git 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
@@ -6,6 +6,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "currentDifficulty": "0x2000020000000",
-    "receipts": []
+    "receipts": [],
+    "gasUsed": "0x0"
   }
-}
+}
diff --git 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"
   }
-}
+}
diff --git 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"
   }
-}
+}
diff --git 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"
   }
-}
+}
diff --git 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"
   }
-}
+}
diff --git 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
@@ -17,6 +17,7 @@
     "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
     "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     "receipts": [],
-    "currentDifficulty": "0x20000"
+    "currentDifficulty": "0x20000",
+    "gasUsed": "0x0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ type ExecutionResult struct {`
`55`	`55`	Receipts types.Receipts `json:"receipts"`
`56`	`56`	Rejected []*rejectedTx `json:"rejected,omitempty"`
`57`	`57`	Difficulty *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
	`58`	+ GasUsed math.HexOrDecimal64 `json:"gasUsed"`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`type ommer struct {`
`@@ -255,6 +256,7 @@ func (pre Prestate) Apply(vmConfig vm.Config, chainConfig params.ChainConfig,`
`255`	`256`	`Receipts: receipts,`
`256`	`257`	`Rejected: rejectedTxs,`
`257`	`258`	`Difficulty: (*math.HexOrDecimal256)(vmContext.Difficulty),`
	`259`	`+ GasUsed: (math.HexOrDecimal64)(gasUsed),`
`258`	`260`	`}`
`259`	`261`	`return statedb, execRs, nil`
`260`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`"error": "nonce too low: address 0x8A8eAFb1cf62BfBeb1741769DAE1a9dd47996192, tx: 0 state: 1"`
`39`	`39`	`}`
`40`	`40`	`],`
`41`		`- "currentDifficulty": "0x20000"`
	`41`	`+ "currentDifficulty": "0x20000",`
	`42`	`+ "gasUsed": "0x5208"`
`42`	`43`	`}`
`43`		`-}`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`"transactionIndex": "0x1"`
`34`	`34`	`}`
`35`	`35`	`],`
`36`		`- "currentDifficulty": "0x20000"`
	`36`	`+ "currentDifficulty": "0x20000",`
	`37`	`+ "gasUsed": "0x109a0"`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"transactionIndex": "0x0"`
`33`	`33`	`}`
`34`	`34`	`],`
`35`		`- "currentDifficulty": "0x20000"`
	`35`	`+ "currentDifficulty": "0x20000",`
	`36`	`+ "gasUsed": "0x521f"`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`"logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",`
`18`	`18`	"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
`19`	`19`	`"receipts": [],`
`20`		`- "currentDifficulty": "0x20000"`
	`20`	`+ "currentDifficulty": "0x20000",`
	`21`	`+ "gasUsed": "0x0"`
`21`	`22`	`}`
`22`	`23`	`}`