From ad0c41282e30694c46acc71b75f6dca2922c7640 Mon Sep 17 00:00:00 2001
From: Kolby Moroz Liebl <31669092+KolbyML@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:26:30 -0600
Subject: [PATCH] fix: unable to execute to Cancun due to bug in
 post_block_beneficiaries

---
 trin-execution/src/evm/post_block_beneficiaries.rs | 7 ++++---
 trin-execution/src/main.rs                         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/trin-execution/src/evm/post_block_beneficiaries.rs b/trin-execution/src/evm/post_block_beneficiaries.rs
index 8b8f9794d..9ba6effd4 100644
--- a/trin-execution/src/evm/post_block_beneficiaries.rs
+++ b/trin-execution/src/evm/post_block_beneficiaries.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use alloy_consensus::constants::ETH_TO_WEI;
-use alloy_primitives::Address;
+use alloy_consensus::constants::{ETH_TO_WEI, GWEI_TO_WEI};
+use alloy_primitives::{Address, U256};
 use revm::{db::State, Evm};
 use revm_primitives::SpecId;
 use trin_evm::spec_id::get_spec_block_number;
@@ -42,7 +42,8 @@ pub fn process_withdrawals(block: &ProcessedBlock, beneficiaries: &mut HashMap<A
             if withdrawal.amount == 0 {
                 continue;
             }
-            *beneficiaries.entry(withdrawal.address).or_default() += withdrawal.amount as u128;
+            *beneficiaries.entry(withdrawal.address).or_default() +=
+                (U256::from(withdrawal.amount) * U256::from(GWEI_TO_WEI)).to::<u128>();
         }
     }
 }
diff --git a/trin-execution/src/main.rs b/trin-execution/src/main.rs
index e4e992ca9..fa25c8274 100644
--- a/trin-execution/src/main.rs
+++ b/trin-execution/src/main.rs
@@ -63,7 +63,7 @@ async fn main() -> anyhow::Result<()> {
         tx.send(()).expect("signal ctrl_c should never fail");
     });
 
-    let end_block = get_spec_block_number(SpecId::SHANGHAI);
+    let end_block = get_spec_block_number(SpecId::CANCUN);
     trin_execution
         .process_range_of_blocks(end_block, Some(rx))
         .await?;