fix(raiko): fix sticky invalid tx state (#184)

* fix sticky invalid tx state * update default beacon rpc node * clear state earlier so we can be sure it's done in all different cases
taikoxyz · May 11, 2024 · 99f5580 · 99f5580
1 parent 970328c
commit 99f5580
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/host/src/preflight.rs b/host/src/preflight.rs
@@ -305,7 +305,7 @@ async fn get_blob_data_beacon(
         // pub signed_block_header: SignedBeaconBlockHeader, // ignore for now
         pub kzg_commitment: String,
         pub kzg_proof: String,
-        pub kzg_commitment_inclusion_proof: Vec<String>,
+        //pub kzg_commitment_inclusion_proof: Vec<String>,
     }
 
     #[derive(Clone, Debug, Deserialize, Serialize)]

diff --git a/host/src/raiko.rs b/host/src/raiko.rs
@@ -286,7 +286,7 @@ mod tests {
             block_number,
             rpc: "https://rpc.hekla.taiko.xyz".to_string(),
             l1_rpc: "https://ethereum-holesky-rpc.publicnode.com".to_string(),
-            beacon_rpc: "https://api.holesky.blobscan.com".to_string(),
+            beacon_rpc: "https://eth-holesky-beacon.public.blastapi.io".to_string(),
             network,
             graffiti: B256::ZERO,
             prover: Address::ZERO,

diff --git a/lib/src/builder/execute.rs b/lib/src/builder/execute.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use core::{fmt::Debug, mem::take, str::from_utf8};
+use std::collections::HashSet;
 
 use alloy_consensus::{constants::BEACON_ROOTS_ADDRESS, TxEnvelope};
 use alloy_primitives::{TxKind, U256};
@@ -29,7 +30,7 @@ use revm::{
         Account, Address, EVMError, HandlerCfg, ResultAndState, SpecId, TransactTo, TxEnv,
         MAX_BLOB_GAS_PER_BLOCK,
     },
-    taiko, Database, DatabaseCommit, Evm,
+    taiko, Database, DatabaseCommit, Evm, JournaledState,
 };
 
 use super::{OptimisticDatabase, TxExecStrategy};
@@ -234,6 +235,9 @@ impl TxExecStrategy for TkoTxExecStrategy {
             let ResultAndState { result, state } = match evm.transact() {
                 Ok(result) => result,
                 Err(err) => {
+                    // Clear the state for the next tx
+                    evm.context.evm.journaled_state = JournaledState::new(spec_id, HashSet::new());
+
                     if is_optimistic {
                         continue;
                     }

diff --git a/script/prove-block.sh b/script/prove-block.sh
@@ -35,7 +35,7 @@ elif [ "$chain" == "taiko_a6" ]; then
 elif [ "$chain" == "taiko_a7" ]; then
 	rpc="https://rpc.hekla.taiko.xyz"
 	l1Rpc="https://ethereum-holesky-rpc.publicnode.com"
-	beaconRpc="https://api.holesky.blobscan.com"
+	beaconRpc="https://eth-holesky-beacon.public.blastapi.io"
 else
 	echo "Invalid chain name. Please use 'ethereum', 'taiko_a6' or 'taiko_a7'."
 	exit 1