Skip to content

Commit 679e907

Browse files
committed
refactor: Rename SignedAuthorizationListEntry to AuthorizationListEntry
1 parent 8791b49 commit 679e907

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

substrate/frame/revive/src/evm/api/rlp_codec.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl Decodable for UnsignedAuthorizationListEntry {
234234
}
235235
}
236236

237-
impl Encodable for SignedAuthorizationListEntry {
237+
impl Encodable for AuthorizationListEntry {
238238
fn rlp_append(&self, s: &mut rlp::RlpStream) {
239239
s.begin_list(6);
240240
s.append(&self.authorization_unsigned.chain_id);
@@ -246,9 +246,9 @@ impl Encodable for SignedAuthorizationListEntry {
246246
}
247247
}
248248

249-
impl Decodable for SignedAuthorizationListEntry {
249+
impl Decodable for AuthorizationListEntry {
250250
fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
251-
Ok(SignedAuthorizationListEntry {
251+
Ok(AuthorizationListEntry {
252252
authorization_unsigned: UnsignedAuthorizationListEntry {
253253
chain_id: rlp.val_at(0)?,
254254
address: rlp.val_at(1)?,

substrate/frame/revive/src/evm/api/rpc_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ fn from_unsigned_works_for_7702() {
459459
gas_price: U256::from(20),
460460
max_fee_per_gas: U256::from(20),
461461
max_priority_fee_per_gas: U256::from(1),
462-
authorization_list: vec![SignedAuthorizationListEntry {
462+
authorization_list: vec![AuthorizationListEntry {
463463
authorization_unsigned: UnsignedAuthorizationListEntry {
464464
chain_id: U256::from(1),
465465
address: H160::from_low_u64_be(42),

substrate/frame/revive/src/evm/api/rpc_types_gen.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ pub struct GenericTransaction {
257257
/// authorizationList
258258
/// List of account code authorizations (EIP-7702)
259259
#[serde(default, skip_serializing_if = "Vec::is_empty")]
260-
pub authorization_list: Vec<SignedAuthorizationListEntry>,
260+
pub authorization_list: Vec<AuthorizationListEntry>,
261261
/// blobVersionedHashes
262262
/// List of versioned blob hashes associated with the transaction's EIP-4844 data blobs.
263263
#[serde(default)]
@@ -787,7 +787,7 @@ pub struct Transaction7702Unsigned {
787787
pub access_list: AccessList,
788788
/// authorizationList
789789
/// List of account code authorizations
790-
pub authorization_list: Vec<SignedAuthorizationListEntry>,
790+
pub authorization_list: Vec<AuthorizationListEntry>,
791791
/// chainId
792792
/// Chain ID that this transaction is valid on.
793793
pub chain_id: U256,
@@ -862,7 +862,7 @@ pub struct UnsignedAuthorizationListEntry {
862862
DecodeWithMemTracking,
863863
)]
864864
#[serde(rename_all = "camelCase")]
865-
pub struct SignedAuthorizationListEntry {
865+
pub struct AuthorizationListEntry {
866866
/// The unsigned authorization entry
867867
#[serde(flatten)]
868868
pub authorization_unsigned: UnsignedAuthorizationListEntry,
@@ -874,7 +874,7 @@ pub struct SignedAuthorizationListEntry {
874874
pub s: U256,
875875
}
876876

877-
impl SignedAuthorizationListEntry {
877+
impl AuthorizationListEntry {
878878
/// Convert signature components (r, s, y_parity) into a 65-byte ECDSA signature.
879879
///
880880
/// # Returns

substrate/frame/revive/src/evm/call.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub struct CallInfo<T: Config> {
4949
/// The ethereum gas limit of the transaction.
5050
pub eth_gas_limit: U256,
5151
/// EIP-7702: List of authorization tuples to process
52-
pub authorization_list: Vec<crate::evm::SignedAuthorizationListEntry>,
52+
pub authorization_list: Vec<crate::evm::AuthorizationListEntry>,
5353
}
5454

5555
/// Mode for creating a call from an ethereum transaction.

substrate/frame/revive/src/evm/eip7702.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
2424
use crate::{
2525
address::AddressMapper,
26-
evm::api::{recover_eth_address_from_message, rlp, SignedAuthorizationListEntry},
26+
evm::api::{recover_eth_address_from_message, rlp, AuthorizationListEntry},
2727
storage::AccountInfo,
2828
weights::WeightInfo,
2929
Config,
@@ -58,7 +58,7 @@ pub const EIP7702_MAGIC: u8 = 0x05;
5858
/// # Returns
5959
/// `Ok(())` on success, or `Err` if out of weight
6060
pub fn process_authorizations<T: Config>(
61-
authorization_list: &[SignedAuthorizationListEntry],
61+
authorization_list: &[AuthorizationListEntry],
6262
chain_id: U256,
6363
meter: &mut WeightMeter,
6464
) -> DispatchResult {
@@ -94,7 +94,7 @@ pub fn process_authorizations<T: Config>(
9494
/// Returns the authority address if validation succeeds, None otherwise.
9595
/// This is exposed for benchmarking purposes.
9696
pub(crate) fn validate_authorization<T: Config>(
97-
auth: &SignedAuthorizationListEntry,
97+
auth: &AuthorizationListEntry,
9898
chain_id: U256,
9999
) -> Option<H160> {
100100
// Validate chain_id
@@ -180,7 +180,7 @@ pub(crate) fn apply_delegation<T: Config>(authority: &H160, target_address: H160
180180
///
181181
/// Implements the EIP-7702 signature recovery:
182182
/// - Message = keccak(MAGIC || rlp([chain_id, address, nonce]))
183-
fn recover_authority(auth: &SignedAuthorizationListEntry) -> Result<H160, ()> {
183+
fn recover_authority(auth: &AuthorizationListEntry) -> Result<H160, ()> {
184184
let mut message = Vec::new();
185185
message.push(EIP7702_MAGIC);
186186

@@ -198,7 +198,7 @@ fn recover_authority(auth: &SignedAuthorizationListEntry) -> Result<H160, ()> {
198198
pub(crate) fn sign_authorization(
199199
signing_key: &k256::ecdsa::SigningKey,
200200
authorization_unsigned: crate::evm::UnsignedAuthorizationListEntry,
201-
) -> SignedAuthorizationListEntry {
201+
) -> AuthorizationListEntry {
202202
use sp_core::keccak_256;
203203

204204
let mut message = Vec::new();
@@ -209,7 +209,7 @@ pub(crate) fn sign_authorization(
209209
let (signature, recovery_id) =
210210
signing_key.sign_prehash_recoverable(&hash).expect("signing succeeds");
211211

212-
SignedAuthorizationListEntry {
212+
AuthorizationListEntry {
213213
authorization_unsigned,
214214
y_parity: U256::from(recovery_id.to_byte()),
215215
r: U256::from_big_endian(&signature.r().to_bytes()),

substrate/frame/revive/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ pub mod pallet {
13841384
transaction_encoded: Vec<u8>,
13851385
effective_gas_price: U256,
13861386
encoded_len: u32,
1387-
authorization_list: Vec<evm::SignedAuthorizationListEntry>,
1387+
authorization_list: Vec<evm::AuthorizationListEntry>,
13881388
) -> DispatchResultWithPostInfo {
13891389
let signer = Self::ensure_eth_signed(origin)?;
13901390
let origin = OriginFor::<T>::signed(signer.clone());

substrate/frame/revive/src/test_utils/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ builder!(
286286
transaction_encoded: Vec<u8>,
287287
effective_gas_price: U256,
288288
encoded_len: u32,
289-
authorization_list: Vec<crate::evm::SignedAuthorizationListEntry>,
289+
authorization_list: Vec<crate::evm::AuthorizationListEntry>,
290290
) -> DispatchResultWithPostInfo;
291291

292292
/// Create a [`EthCallWithAuthorizationListBuilder`] with default values.

substrate/frame/revive/src/tests/eip7702.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//! Tests for EIP-7702: Set EOA Account Code
1919
2020
use crate::{
21-
evm::{fees::InfoT, SignedAuthorizationListEntry, UnsignedAuthorizationListEntry},
21+
evm::{fees::InfoT, AuthorizationListEntry, UnsignedAuthorizationListEntry},
2222
storage::AccountInfo,
2323
test_utils::builder::Contract,
2424
tests::{builder, *},
@@ -74,7 +74,7 @@ impl TestSigner {
7474
chain_id: U256,
7575
address: H160,
7676
nonce: U256,
77-
) -> SignedAuthorizationListEntry {
77+
) -> AuthorizationListEntry {
7878
let mut message = Vec::new();
7979
message.push(crate::evm::eip7702::EIP7702_MAGIC);
8080

@@ -98,7 +98,7 @@ impl TestSigner {
9898
let s = U256::from_big_endian(&s_bytes);
9999
let y_parity = U256::from(recovery_id);
100100

101-
SignedAuthorizationListEntry { authorization_unsigned, y_parity, r, s }
101+
AuthorizationListEntry { authorization_unsigned, y_parity, r, s }
102102
}
103103
}
104104

0 commit comments

Comments
 (0)