Bump alloy to 0.8.0 (#13268)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
morito
2024-12-11 05:06:21 +09:00
committed by GitHub
parent 62e2cbfe86
commit 73f1583455
14 changed files with 192 additions and 216 deletions

View File

@ -7,7 +7,7 @@ use alloy_primitives::{bytes, Bytes, TxKind, Uint, B256};
#[cfg(any(test, feature = "reth-codec"))]
use alloy_consensus::constants::EIP7702_TX_TYPE_ID;
use alloy_consensus::{SignableTransaction, TxLegacy};
use alloy_consensus::{SignableTransaction, TxLegacy, Typed2718};
use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
use derive_more::{Constructor, Deref, From};
use op_alloy_consensus::OpTypedTransaction;
@ -157,10 +157,6 @@ impl alloy_consensus::Transaction for OpTransaction {
self.0.input()
}
fn ty(&self) -> u8 {
self.0.ty()
}
fn access_list(&self) -> Option<&AccessList> {
self.0.access_list()
}
@ -197,3 +193,9 @@ impl InMemorySize for OpTransaction {
}
}
}
impl Typed2718 for OpTransaction {
fn ty(&self) -> u8 {
self.0.ty()
}
}

View File

@ -4,6 +4,7 @@ use crate::{OpTransaction, OpTxType};
use alloc::vec::Vec;
use alloy_consensus::{
transaction::RlpEcdsaTx, SignableTransaction, Transaction, TxEip1559, TxEip2930, TxEip7702,
Typed2718,
};
use alloy_eips::{
eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718},
@ -228,7 +229,7 @@ impl alloy_rlp::Encodable for OpTransactionSigned {
fn length(&self) -> usize {
let mut payload_length = self.encode_2718_len();
if !self.is_legacy() {
if !Encodable2718::is_legacy(self) {
payload_length += Header { list: false, payload_length }.length();
}
@ -377,10 +378,6 @@ impl Transaction for OpTransactionSigned {
self.deref().input()
}
fn ty(&self) -> u8 {
self.deref().ty()
}
fn access_list(&self) -> Option<&AccessList> {
self.deref().access_list()
}
@ -406,6 +403,12 @@ impl Transaction for OpTransactionSigned {
}
}
impl Typed2718 for OpTransactionSigned {
fn ty(&self) -> u8 {
self.deref().ty()
}
}
impl Default for OpTransactionSigned {
fn default() -> Self {
Self {