|
|
|
@ -1272,10 +1272,14 @@ func TestFillBlobTransaction(t *testing.T) { |
|
|
|
|
|
|
|
|
|
func argsFromTransaction(tx *types.Transaction, from common.Address) TransactionArgs { |
|
|
|
|
var ( |
|
|
|
|
gas = tx.Gas() |
|
|
|
|
nonce = tx.Nonce() |
|
|
|
|
input = tx.Data() |
|
|
|
|
gas = tx.Gas() |
|
|
|
|
nonce = tx.Nonce() |
|
|
|
|
input = tx.Data() |
|
|
|
|
accessList *types.AccessList |
|
|
|
|
) |
|
|
|
|
if acl := tx.AccessList(); acl != nil { |
|
|
|
|
accessList = &acl |
|
|
|
|
} |
|
|
|
|
return TransactionArgs{ |
|
|
|
|
From: &from, |
|
|
|
|
To: tx.To(), |
|
|
|
@ -1286,10 +1290,9 @@ func argsFromTransaction(tx *types.Transaction, from common.Address) Transaction |
|
|
|
|
Nonce: (*hexutil.Uint64)(&nonce), |
|
|
|
|
Input: (*hexutil.Bytes)(&input), |
|
|
|
|
ChainID: (*hexutil.Big)(tx.ChainId()), |
|
|
|
|
// TODO: impl accessList conversion
|
|
|
|
|
//AccessList: tx.AccessList(),
|
|
|
|
|
BlobFeeCap: (*hexutil.Big)(tx.BlobGasFeeCap()), |
|
|
|
|
BlobHashes: tx.BlobHashes(), |
|
|
|
|
AccessList: accessList, |
|
|
|
|
BlobFeeCap: (*hexutil.Big)(tx.BlobGasFeeCap()), |
|
|
|
|
BlobHashes: tx.BlobHashes(), |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|