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

mask-pp · fjl · web-flow · commit 9d537f543990 · 2024-02-15T10:08:46.000+01:00
Co-authored-by: Felix Lange &lt;fjl@twurst.com&gt;
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
@@ -665,6 +665,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
@@ -152,6 +152,10 @@ type CallMsg struct {
 	Data      []byte          // input data, usually an ABI-encoded contract method invocation
 
 	AccessList types.AccessList // EIP-2930 access list.
+
+	// For BlobTxType
+	BlobGasFeeCap *big.Int
+	BlobHashes    []common.Hash
 }
 
 // A ContractCaller provides contract calls, essentially transactions that are executed by

Original file line number	Diff line number	Diff line change
`@@ -665,6 +665,12 @@ func toCallArg(msg ethereum.CallMsg) interface{} {`
`665`	`665`	`if msg.AccessList != nil {`
`666`	`666`	`arg["accessList"] = msg.AccessList`
`667`	`667`	`}`
	`668`	`+ if msg.BlobGasFeeCap != nil {`
	`669`	`+ arg["maxFeePerBlobGas"] = (*hexutil.Big)(msg.BlobGasFeeCap)`
	`670`	`+ }`
	`671`	`+ if msg.BlobHashes != nil {`
	`672`	`+ arg["blobVersionedHashes"] = msg.BlobHashes`
	`673`	`+ }`
`668`	`674`	`return arg`
`669`	`675`	`}`
`670`	`676`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,10 @@ type CallMsg struct {`
`152`	`152`	`Data []byte // input data, usually an ABI-encoded contract method invocation`
`153`	`153`
`154`	`154`	`AccessList types.AccessList // EIP-2930 access list.`
	`155`	`+`
	`156`	`+ // For BlobTxType`
	`157`	`+ BlobGasFeeCap *big.Int`
	`158`	`+ BlobHashes []common.Hash`
`155`	`159`	`}`
`156`	`160`
`157`	`161`	`// A ContractCaller provides contract calls, essentially transactions that are executed by`