NDEV-3380 don't interrupt solana call with SyncedExecutorState

neonlabsorg · Nov 8, 2024 · a762bec · a762bec
1 parent 7efb03a
commit a762bec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/evm_loader/program/src/evm/database.rs b/evm_loader/program/src/evm/database.rs
@@ -10,6 +10,7 @@ use solana_program::{
 
 #[maybe_async(?Send)]
 pub trait Database: LogCollector {
+    fn is_synced_state(&self) -> bool;
     fn program_id(&self) -> &Pubkey;
     fn operator(&self) -> Pubkey;
     fn chain_id_to_token(&self, chain_id: u64) -> Pubkey;

diff --git a/evm_loader/program/src/executor/precompile_extension/call_solana.rs b/evm_loader/program/src/executor/precompile_extension/call_solana.rs
@@ -317,7 +317,7 @@ async fn execute_external_instruction<State: Database>(
     #[cfg(not(target_os = "solana"))]
     log::info!("instruction: {:?}", instruction);
 
-    if context.interrupt_solana_call {
+    if !state.is_synced_state() && context.interrupt_solana_call {
         context.interrupt_solana_call = false;
         return Err(Error::InterruptedCall);
     }

diff --git a/evm_loader/program/src/executor/state.rs b/evm_loader/program/src/executor/state.rs
@@ -184,6 +184,9 @@ impl<B: AccountStorage> LogCollector for ExecutorState<'_, B> {
 
 #[maybe_async(?Send)]
 impl<'a, B: AccountStorage> Database for ExecutorState<'a, B> {
+    fn is_synced_state(&self) -> bool {
+        false
+    }
     fn program_id(&self) -> &Pubkey {
         self.backend.program_id()
     }

diff --git a/evm_loader/program/src/executor/synced_state.rs b/evm_loader/program/src/executor/synced_state.rs
@@ -57,6 +57,9 @@ impl<B: AccountStorage> LogCollector for SyncedExecutorState<'_, B> {
 
 #[maybe_async(?Send)]
 impl<'a, B: SyncedAccountStorage> Database for SyncedExecutorState<'a, B> {
+    fn is_synced_state(&self) -> bool {
+        true
+    }
     fn program_id(&self) -> &Pubkey {
         self.backend.program_id()
     }