Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Re-enable the transaction.other field for optimism feature #2622

Merged
mattsse merged 2 commits into from
Nov 16, 2023
Merged

Re-enable the transaction.other field for optimism feature #2622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a307c9f
Re-enable the other field for optimism feature
mdehoog Oct 3, 2023
36bbf59
Merge branch 'master' into michael/optimism-other
mattsse Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ethers-core/src/types/transaction/optimism.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ mod test {
max_priority_fee_per_gas: None,
max_fee_per_gas: None,
chain_id: None,
other: crate::types::OtherFields::default(),
};

let rlp = deposited_tx.rlp();
Expand Down
4 changes: 3 additions & 1 deletion ethers-core/src/types/transaction/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub struct Transaction {
pub chain_id: Option<U256>,

/// Captures unknown fields such as additional fields used by L2s
#[cfg(not(any(feature = "celo", feature = "optimism")))]
#[cfg(not(any(feature = "celo")))]
#[serde(flatten)]
pub other: crate::types::OtherFields,
Comment on lines +135 to 137
Copy link
Collaborator

@mattsse mattsse Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, I think this is reasonable to always enable this because this is also useful for other chains that include additional fields

}
Expand Down Expand Up @@ -649,6 +649,8 @@ mod tests {
max_priority_fee_per_gas: None,
max_fee_per_gas: None,
chain_id: None,
#[cfg(not(feature = "celo"))]
other: crate::types::OtherFields::default(),
};

let encoded_rlp_bytes = deposited_tx.rlp();
Expand Down