fix receipt json marshaling/unmarshaling

Signed-off-by: Roberto Bayardo <roberto.bayardo@coinbase.com>

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.

core/types/receipt_test.go

@@ -489,6 +489,29 @@ func TestReceiptJSON(t *testing.T) {
 			t.Fatal("error unmarshaling receipt from json:", err)
 		}
 	}
+
+	// Test that deposit tx fields are appropriately preserved across marshal/unmarshal
+	b, err := depositReceiptWithNonceAndVersion.MarshalJSON()
+	if err != nil {
+		t.Fatal("error marshaling receipt to json:", err)
+	}
+	r := Receipt{}
+	err = r.UnmarshalJSON(b)
+	if err != nil {
+		t.Fatal("error unmarshaling receipt from json:", err)
+	}
+	if r.DepositNonce == nil {
+		t.Fatal("expected non nil deposit nonce")
+	}
+	if r.DepositReceiptVersion == nil {
+		t.Fatal("expected non nil deposit nonce")
+	}
+	if *r.DepositNonce != *depositReceiptWithNonceAndVersion.DepositNonce {
+		t.Fatal("Deposit nonces don't match", r.DepositNonce, depositReceiptWithNonceAndVersion.DepositNonce)
+	}
+	if *r.DepositReceiptVersion != *depositReceiptWithNonceAndVersion.DepositReceiptVersion {
+		t.Fatal("Deposit receipt versions don't match", r.DepositReceiptVersion, depositReceiptWithNonceAndVersion.DepositReceiptVersion)
+	}
 }
 
 // Test we can still parse receipt without EffectiveGasPrice for backwards compatibility, even