feat(consensus): Operator Fee Vault Txs

crates/consensus/src/hardforks/bytecode/gpo_isthmus.hex

@@ -0,0 +1 @@
+TODO

crates/consensus/src/hardforks/bytecode/l1_block_isthmus.hex

@@ -0,0 +1 @@
+TODO

crates/consensus/src/hardforks/bytecode/ofv_isthmus.hex

@@ -0,0 +1 @@
+TODO

crates/consensus/src/hardforks/isthmus.rs

@@ -17,15 +17,122 @@ use crate::{Hardfork, TxDeposit};
 pub struct Isthmus;
 
 impl Isthmus {
+    /// The depositor account address.
+    pub const DEPOSITOR_ACCOUNT: Address = address!("DeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001");
+
+    /// The Enable Isthmus Input Method 4Byte Signature.
+    ///
+    /// Derive this by running `cast sig "setIsthmus()"`.
+    pub const ENABLE_ISTHMUS_INPUT: [u8; 4] = hex!("8e98b106");
+
     /// EIP-2935 From Address
     pub const EIP2935_FROM: Address = address!("3462413Af4609098e1E27A490f554f260213D685");
 
+    /// L1 Block Deployer Address
+    pub const L1_BLOCK_DEPLOYER: Address = address!("4210000000000000000000000000000000000003");
+
+    /// The L1 Block Proxy Address
+    pub const L1_BLOCK_PROXY: Address = address!("4200000000000000000000000000000000000015");
+
+    /// The Gas Price Oracle Deployer Address
+    pub const GAS_PRICE_ORACLE_DEPLOYER: Address =
+        address!("4210000000000000000000000000000000000004");
+
+    /// The address of the Gas Price Oracle Proxy
+    pub const GAS_PRICE_ORACLE_PROXY: Address =
+        address!("420000000000000000000000000000000000000F");
+
+    /// The Operator Fee Vault Deployer Address
+    pub const OPERATOR_FEE_VAULT_DEPLOYER: Address =
+        address!("4210000000000000000000000000000000000005");
+
+    /// The address of the Operator Fee Vault Proxy
+    pub const OPERATOR_FEE_VAULT_PROXY: Address =
+        address!("420000000000000000000000000000000000001B");
+
+    /// The new L1 Block Address
+    /// This is computed by using go-ethereum's `crypto.CreateAddress` function,
+    /// with the L1 Block Deployer Address and nonce 0.
+    pub const NEW_L1_BLOCK: Address = address!("ff256497d61dcd71a9e9ff43967c13fde1f72d12");
+
+    /// The Gas Price Oracle Address
+    /// This is computed by using go-ethereum's `crypto.CreateAddress` function,
+    /// with the Gas Price Oracle Deployer Address and nonce 0.
+    pub const GAS_PRICE_ORACLE: Address = address!("93e57a196454cb919193fa9946f14943cf733845");
+
+    /// The Operator Fee Vault Address
+    /// This is computed by using go-ethereum's `crypto.CreateAddress` function,
+    /// with the Operator Fee Vault Deployer Address and nonce 0.
+    pub const OPERATOR_FEE_VAULT: Address = address!("4fa2be8cd41504037f1838bce3bcc93bc68ff537");
+
+    /// Returns the source hash for the Isthmus Gas Price Oracle activation.
+    pub fn enable_isthmus_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: Gas Price Oracle Set Isthmus") }
+            .source_hash()
+    }
+
     /// Returns the source hash for the Isthmus Deposit Contract deployment.
     pub fn deposit_contract_source() -> B256 {
         UpgradeDepositSource { intent: String::from("Isthmus: deposit contract deployment") }
             .source_hash()
     }
 
+    /// Returns the source hash for the deployment of the gas price oracle contract.
+    pub fn deploy_gas_price_oracle_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: Gas Price Oracle Deployment") }
+            .source_hash()
+    }
+
+    /// Returns the source hash for the deployment of the l1 block contract.
+    pub fn deploy_l1_block_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: L1 Block Deployment") }.source_hash()
+    }
+
+    /// Returns the source hash for the deployment of the operator fee vault contract.
+    pub fn deploy_operator_fee_vault_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: Operator Fee Vault Deployment") }
+            .source_hash()
+    }
+
+    /// Returns the source hash for the update of the l1 block proxy.
+    pub fn update_l1_block_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: L1 Block Proxy Update") }
+            .source_hash()
+    }
+
+    /// Returns the source hash for the update of the gas price oracle proxy.
+    pub fn update_gas_price_oracle_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: Gas Price Oracle Proxy Update") }
+            .source_hash()
+    }
+
+    /// Returns the source hash for the update of the operator fee vault proxy.
+    pub fn update_operator_fee_vault_source() -> B256 {
+        UpgradeDepositSource { intent: String::from("Isthmus: Operator Fee Vault Proxy Update") }
+            .source_hash()
+    }
+
+    /// Returns the raw bytecode for the L1 Block deployment.
+    pub fn l1_block_deployment_bytecode() -> Bytes {
+        hex::decode(include_str!("./bytecode/l1_block_isthmus.hex").replace("\n", ""))
+            .expect("Expected hex byte string")
+            .into()
+    }
+
+    /// Returns the gas price oracle deployment bytecode.
+    pub fn gas_price_oracle_deployment_bytecode() -> Bytes {
+        hex::decode(include_str!("./bytecode/gpo_isthmus.hex").replace("\n", ""))
+            .expect("Expected hex byte string")
+            .into()
+    }
+
+    /// Returns the gas price oracle deployment bytecode.
+    pub fn operator_fee_vault_deployment_bytecode() -> Bytes {
+        hex::decode(include_str!("./bytecode/ofv_isthmus.hex").replace("\n", ""))
+            .expect("Expected hex byte string")
+            .into()
+    }
+
     /// Returns the EIP-2935 creation data.
     pub fn eip2935_creation_data() -> Bytes {
         hex::decode(include_str!("./bytecode/eip2935_isthmus.hex").replace("\n", ""))
@@ -35,16 +142,88 @@ impl Isthmus {
 
     /// Returns the list of [TxDeposit]s for the network upgrade.
     pub fn deposits() -> impl Iterator<Item = TxDeposit> {
-        ([TxDeposit {
-            source_hash: Self::deposit_contract_source(),
-            from: Self::EIP2935_FROM,
-            to: TxKind::Create,
-            mint: 0.into(),
-            value: U256::ZERO,
-            gas_limit: 250_000,
-            is_system_transaction: false,
-            input: Self::eip2935_creation_data(),
-        }])
+        ([
+            TxDeposit {
+                source_hash: Self::deploy_l1_block_source(),
+                from: Self::L1_BLOCK_DEPLOYER,
+                to: TxKind::Create,
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 425_000,
+                is_system_transaction: false,
+                input: Self::l1_block_deployment_bytecode(),
+            },
+            TxDeposit {
+                source_hash: Self::deploy_gas_price_oracle_source(),
+                from: Self::GAS_PRICE_ORACLE_DEPLOYER,
+                to: TxKind::Create,
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 1_625_000,
+                is_system_transaction: false,
+                input: Self::gas_price_oracle_deployment_bytecode(),
+            },
+            TxDeposit {
+                source_hash: Self::deploy_operator_fee_vault_source(),
+                from: Self::OPERATOR_FEE_VAULT_DEPLOYER,
+                to: TxKind::Create,
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 500_000,
+                is_system_transaction: false,
+                input: Self::operator_fee_vault_deployment_bytecode(),
+            },
+            TxDeposit {
+                source_hash: Self::update_l1_block_source(),
+                from: Address::default(),
+                to: TxKind::Call(Self::L1_BLOCK_PROXY),
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 50_000,
+                is_system_transaction: false,
+                input: super::upgrade_to_calldata(Self::NEW_L1_BLOCK),
+            },
+            TxDeposit {
+                source_hash: Self::update_gas_price_oracle_source(),
+                from: Address::default(),
+                to: TxKind::Call(Self::GAS_PRICE_ORACLE_PROXY),
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 50_000,
+                is_system_transaction: false,
+                input: super::upgrade_to_calldata(Self::GAS_PRICE_ORACLE),
+            },
+            TxDeposit {
+                source_hash: Self::update_operator_fee_vault_source(),
+                from: Address::default(),
+                to: TxKind::Call(Self::OPERATOR_FEE_VAULT_PROXY),
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 50_000,
+                is_system_transaction: false,
+                input: super::upgrade_to_calldata(Self::OPERATOR_FEE_VAULT),
+            },
+            TxDeposit {
+                source_hash: Self::enable_isthmus_source(),
+                from: Self::DEPOSITOR_ACCOUNT,
+                to: TxKind::Call(Self::GAS_PRICE_ORACLE_PROXY),
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 90_000,
+                is_system_transaction: false,
+                input: Self::ENABLE_ISTHMUS_INPUT.into(),
+            },
+            TxDeposit {
+                source_hash: Self::deposit_contract_source(),
+                from: Self::EIP2935_FROM,
+                to: TxKind::Create,
+                mint: 0.into(),
+                value: U256::ZERO,
+                gas_limit: 250_000,
+                is_system_transaction: false,
+                input: Self::eip2935_creation_data(),
+            },
+        ])
         .into_iter()
     }
 }
@@ -64,6 +243,49 @@ impl Hardfork for Isthmus {
 mod tests {
     use super::*;
     use alloc::vec;
+    use alloy_primitives::b256;
+
+    #[test]
+    fn test_l1_block_source_hash() {
+        let expected = b256!("3b2d0821ca2411ad5cd3595804d1213d15737188ae4cbd58aa19c821a6c211bf");
+        assert_eq!(Isthmus::deploy_l1_block_source(), expected);
+    }
+
+    #[test]
+    fn test_gas_price_oracle_source_hash() {
+        let expected = b256!("fc70b48424763fa3fab9844253b4f8d508f91eb1f7cb11a247c9baec0afb8035");
+        assert_eq!(Isthmus::deploy_gas_price_oracle_source(), expected);
+    }
+
+    #[test]
+    fn test_operator_fee_vault_source_hash() {
+        let expected = b256!("107a570d3db75e6110817eb024f09f3172657e920634111ce9875d08a16daa96");
+        assert_eq!(Isthmus::deploy_operator_fee_vault_source(), expected);
+    }
+
+    #[test]
+    fn test_l1_block_update_source_hash() {
+        let expected = b256!("ebe8b5cb10ca47e0d8bda8f5355f2d66711a54ddeb0ef1d30e29418c9bf17a0e");
+        assert_eq!(Isthmus::update_l1_block_source(), expected);
+    }
+
+    #[test]
+    fn test_gas_price_oracle_update_source_hash() {
+        let expected = b256!("ecf2d9161d26c54eda6b7bfdd9142719b1e1199a6e5641468d1bf705bc531ab0");
+        assert_eq!(Isthmus::update_gas_price_oracle_source(), expected);
+    }
+
+    #[test]
+    fn test_operator_fee_vault_update_source_hash() {
+        let expected = b256!("ad74e1adb877ccbe176b8fa1cc559388a16e090ddbe8b512f5b37d07d887a927");
+        assert_eq!(Isthmus::update_operator_fee_vault_source(), expected);
+    }
+
+    #[test]
+    fn test_enable_isthmus_source() {
+        let expected = b256!("3ddf4b1302548dd92939826e970f260ba36167f4c25f18390a5e8b194b295319");
+        assert_eq!(Isthmus::enable_isthmus_source(), expected);
+    }
 
     #[test]
     fn test_isthmus_txs_encoded() {