Feat/add withdrawals root

ethers-core/src/types/block.rs

@@ -1,6 +1,6 @@
 // Modified from <https://github.com/tomusdrw/rust-web3/blob/master/src/types/block.rs>
 
-use crate::types::{Address, Bloom, Bytes, Transaction, TxHash, H256, U256, U64};
+use crate::types::{Address, Bloom, Bytes, Transaction, TxHash, Withdrawal, H256, U256, U64};
 use chrono::{DateTime, TimeZone, Utc};
 use serde::{
     de::{MapAccess, Visitor},
@@ -84,10 +84,14 @@ pub struct Block<TX> {
     /// Base fee per unit of gas (if past London)
     #[serde(rename = "baseFeePerGas")]
     pub base_fee_per_gas: Option<U256>,
-    /// Withdrawals root hash (EIP-4895)
-    #[serde(rename = "withdrawalsRoot")]
+    /// Withdrawals root hash (if past Shanghai)
+    #[serde(skip_serializing_if = "Option::is_none", rename = "withdrawalsRoot")]
     #[cfg(not(feature = "celo"))]
     pub withdrawals_root: Option<H256>,
+    /// Withdrawals (if past Shanghai)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[cfg(not(feature = "celo"))]
+    pub withdrawals: Option<Vec<Withdrawal>>,
 
     #[cfg(feature = "celo")]
     #[cfg_attr(docsrs, doc(cfg(feature = "celo")))]
@@ -223,6 +227,7 @@ impl Block<TxHash> {
                 nonce,
                 base_fee_per_gas,
                 withdrawals_root,
+                withdrawals,
                 other,
                 ..
             } = self;
@@ -249,6 +254,7 @@ impl Block<TxHash> {
                 nonce,
                 base_fee_per_gas,
                 withdrawals_root,
+                withdrawals,
                 transactions,
                 other,
             }
@@ -329,6 +335,7 @@ impl From<Block<Transaction>> for Block<TxHash> {
                 nonce,
                 base_fee_per_gas,
                 withdrawals_root,
+                withdrawals,
                 other,
             } = full;
             Block {
@@ -354,6 +361,7 @@ impl From<Block<Transaction>> for Block<TxHash> {
                 nonce,
                 base_fee_per_gas,
                 withdrawals_root,
+                withdrawals,
                 transactions: transactions.iter().map(|tx| tx.hash).collect(),
                 other,
             }

ethers-core/src/types/mod.rs

@@ -81,3 +81,6 @@ pub use syncing::{SyncProgress, SyncingStatus};
 
 mod opcode;
 pub use opcode::Opcode;
+
+mod withdrawal;
+pub use withdrawal::Withdrawal;

ethers-core/src/types/withdrawal.rs

@@ -0,0 +1,29 @@
+use crate::types::{Address, U256, U64};
+use serde::{Deserialize, Serialize};
+
+/// A validator withdrawal from the consensus layer.
+/// See EIP-4895: Beacon chain push withdrawals as operations.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Withdrawal {
+    /// Monotonically increasing identifier issued by consensus layer
+    pub index: U64,
+
+    /// Index of validator associated with withdrawal
+    pub validator: U64,
+
+    /// Target address for withdrawn ether
+    pub address: Address,
+
+    /// Value of withdrawal (in wei)
+    pub amount: U256,
+}
+
+impl rlp::Encodable for Withdrawal {
+    fn rlp_append(&self, s: &mut rlp::RlpStream) {
+        s.begin_list(4);
+        s.append(&self.index);
+        s.append(&self.validator);
+        s.append(&self.address);
+        s.append(&self.amount);
+    }
+}