fix return type in tx receipt for l1fee type (#254)

maxwolff · Thegaram · web-flow · commit 028acecb02ca · 2023-04-19T05:12:57.000+02:00
* edit marshalling override

* goimports

* not required

* encode l1fee

---------

Co-authored-by: Péter Garamvölgyi &lt;th307q@gmail.com&gt;
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
@@ -75,7 +75,7 @@ type Receipt struct {
 	ReturnValue []byte `json:"returnValue,omitempty"`
 
 	// Scroll rollup
-	L1Fee *big.Int `json:"l1Fee,omitempty" gencodec:"required"`
+	L1Fee *big.Int `json:"l1Fee,omitempty"`
 }
 
 type receiptMarshaling struct {
@@ -86,6 +86,7 @@ type receiptMarshaling struct {
 	GasUsed           hexutil.Uint64
 	BlockNumber       *hexutil.Big
 	TransactionIndex  hexutil.Uint
+	L1Fee             *hexutil.Big
 }
 
 // receiptRLP is the consensus encoding of a receipt.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1669,7 +1669,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 		"logs":              receipt.Logs,
 		"logsBloom":         receipt.Bloom,
 		"type":              hexutil.Uint(tx.Type()),
-		"l1Fee":             receipt.L1Fee,
+		"l1Fee":             hexutil.Uint64(receipt.L1Fee.Uint64()),
 	}
 	// Assign the effective gas price paid
 	if !s.b.ChainConfig().IsLondon(bigblock) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ type Receipt struct {`
`75`	`75`	ReturnValue []byte `json:"returnValue,omitempty"`
`76`	`76`
`77`	`77`	`// Scroll rollup`
`78`		- L1Fee *big.Int `json:"l1Fee,omitempty" gencodec:"required"`
	`78`	+ L1Fee *big.Int `json:"l1Fee,omitempty"`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`type receiptMarshaling struct {`
`@@ -86,6 +86,7 @@ type receiptMarshaling struct {`
`86`	`86`	`GasUsed hexutil.Uint64`
`87`	`87`	`BlockNumber *hexutil.Big`
`88`	`88`	`TransactionIndex hexutil.Uint`
	`89`	`+ L1Fee *hexutil.Big`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`// receiptRLP is the consensus encoding of a receipt.`
Original file line number	Diff line number	Diff line change
`@@ -1669,7 +1669,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha`
`1669`	`1669`	`"logs": receipt.Logs,`
`1670`	`1670`	`"logsBloom": receipt.Bloom,`
`1671`	`1671`	`"type": hexutil.Uint(tx.Type()),`
`1672`		`- "l1Fee": receipt.L1Fee,`
	`1672`	`+ "l1Fee": hexutil.Uint64(receipt.L1Fee.Uint64()),`
`1673`	`1673`	`}`
`1674`	`1674`	`// Assign the effective gas price paid`
`1675`	`1675`	`if !s.b.ChainConfig().IsLondon(bigblock) {`