fix receipt json marshaling/unmarshaling

Signed-off-by: Roberto Bayardo <roberto.bayardo@coinbase.com>
ethereum-optimism · Oct 25, 2023 · 622226d · 622226d
1 parent 29cd9a3
commit 622226d
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 47 deletions.
diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go
diff --git a/core/types/receipt.go b/core/types/receipt.go
@@ -103,11 +103,13 @@ type receiptMarshaling struct {
 	BlockNumber       *hexutil.Big
 	TransactionIndex  hexutil.Uint
 
-	// Optimism: extend receipts with their L1 price (if a rollup tx)
-	L1GasPrice *hexutil.Big
-	L1GasUsed  *hexutil.Big
-	L1Fee      *hexutil.Big
-	FeeScalar  *big.Float
+	// Optimism
+	L1GasPrice            *hexutil.Big
+	L1GasUsed             *hexutil.Big
+	L1Fee                 *hexutil.Big
+	FeeScalar             *big.Float
+	DepositNonce          *hexutil.Uint64
+	DepositReceiptVersion *hexutil.Uint64
 }
 
 // receiptRLP is the consensus encoding of a receipt.

diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go
@@ -488,6 +488,18 @@ func TestReceiptJSON(t *testing.T) {
 		if err != nil {
 			t.Fatal("error unmarshaling receipt from json:", err)
 		}
+
+		// Make sure marshal/unmarshal doesn't affect receipt hash root computation by comparing
+		// the output of EncodeIndex
+		rsBefore := Receipts([]*Receipt{receipts[i]})
+		rsAfter := Receipts([]*Receipt{&r})
+
+		encBefore, encAfter := bytes.Buffer{}, bytes.Buffer{}
+		rsBefore.EncodeIndex(0, &encBefore)
+		rsAfter.EncodeIndex(0, &encAfter)
+		if !bytes.Equal(encBefore.Bytes(), encAfter.Bytes()) {
+			t.Errorf("%v: EncodeIndex differs after JSON marshal/unmarshal", i)
+		}
 	}
 }