ethereum, ethclient: add blob transaction fields in CallMsg (ethereum#28989)

mask-pp · fjl · 0xmountaintop · commit 8bd49ab63d7f · 2024-07-03T21:07:10.000+08:00
Co-authored-by: Felix Lange &lt;fjl@twurst.com&gt;
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
@@ -686,6 +686,12 @@ func toCallArg(msg ethereum.CallMsg) interface{} {
 	if msg.AccessList != nil {
 		arg["accessList"] = msg.AccessList
 	}
+	if msg.BlobGasFeeCap != nil {
+		arg["maxFeePerBlobGas"] = (*hexutil.Big)(msg.BlobGasFeeCap)
+	}
+	if msg.BlobHashes != nil {
+		arg["blobVersionedHashes"] = msg.BlobHashes
+	}
 	return arg
 }
 
diff --git a/interfaces.go b/interfaces.go
@@ -143,6 +143,10 @@ type CallMsg struct {
 
 	AccessList types.AccessList // EIP-2930 access list.
 
+	// For BlobTxType
+	BlobGasFeeCap *big.Int
+	BlobHashes    []common.Hash
+
 	// scroll-related:
 	// not need to have a `IsL1MessageTx` field, should always be false
 }

Original file line number	Diff line number	Diff line change
`@@ -686,6 +686,12 @@ func toCallArg(msg ethereum.CallMsg) interface{} {`
`686`	`686`	`if msg.AccessList != nil {`
`687`	`687`	`arg["accessList"] = msg.AccessList`
`688`	`688`	`}`
	`689`	`+ if msg.BlobGasFeeCap != nil {`
	`690`	`+ arg["maxFeePerBlobGas"] = (*hexutil.Big)(msg.BlobGasFeeCap)`
	`691`	`+ }`
	`692`	`+ if msg.BlobHashes != nil {`
	`693`	`+ arg["blobVersionedHashes"] = msg.BlobHashes`
	`694`	`+ }`
`689`	`695`	`return arg`
`690`	`696`	`}`
`691`	`697`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,10 @@ type CallMsg struct {`
`143`	`143`
`144`	`144`	`AccessList types.AccessList // EIP-2930 access list.`
`145`	`145`
	`146`	`+ // For BlobTxType`
	`147`	`+ BlobGasFeeCap *big.Int`
	`148`	`+ BlobHashes []common.Hash`
	`149`	`+`
`146`	`150`	`// scroll-related:`
`147`	`151`	// not need to have a `IsL1MessageTx` field, should always be false
`148`	`152`	`}`