Merge branch 'v1.1.4-taiko' of gh_work:taikoxyz/taiko-reth into v1.1.…

…4-taiko
taikoxyz · Dec 27, 2024 · 587b8b1 · 587b8b1
2 parents deb4cbc + 5fa3fcb
commit 587b8b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crates/storage/errors/src/provider.rs b/crates/storage/errors/src/provider.rs
@@ -138,11 +138,11 @@ pub enum ProviderError {
     InvalidStorageOutput,
 
     /// L1 origin error
-    #[display("not L1Origin found for block #{_0}")]
+    #[display("not found")]
     L1OriginNotFound(BlockNumber),
 
     /// Head L1 origin error
-    #[display("head L1Origin does not exist")]
+    #[display("not found")]
     HeadL1OriginNotFound,
 }
 

diff --git a/crates/taiko/evm/src/lib.rs b/crates/taiko/evm/src/lib.rs
@@ -71,15 +71,15 @@ impl ConfigureEvmEnv for TaikoEvmConfig {
         if let Some(EnvExt { is_anchor, block_number, extra_data }) = ext {
             // Set taiko specific data
             tx_env.taiko.is_anchor = is_anchor;
-            // set the treasury address
-            let treasury = self.chain_spec.treasury();
-            tx_env.taiko.treasury = treasury;
 
             if self.chain_spec.is_ontake_active_at_block(block_number) {
                 // set the basefee ratio
                 tx_env.taiko.basefee_ratio = decode_ontake_extra_data(extra_data);
             }
         }
+        // set the treasury address
+        let treasury = self.chain_spec.treasury();
+        tx_env.taiko.treasury = treasury;
     }
 
     fn fill_tx_env_system_contract_call(