feat(katana): revert blockifier bump (#2979)

* feat: downgrade `blockifier` * use rev * update test db
dojoengine · Feb 1, 2025 · 12d9c8d · 12d9c8d
1 parent a9e65a3
commit 12d9c8d
Show file tree

Hide file tree

Showing 15 changed files with 334 additions and 511 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/katana/cairo/Cargo.toml b/crates/katana/cairo/Cargo.toml
@@ -18,7 +18,7 @@ cairo-lang-starknet = "2.7.0"
 cairo-lang-starknet-classes = "2.7.0"
 cairo-lang-utils = "2.7.0"
 cairo-vm = "1.0.1"
-starknet_api = { git = "https://github.com/dojoengine/sequencer", rev = "802c5dc" }
+starknet_api = { git = "https://github.com/dojoengine/sequencer", rev = "adae779" }
 
 [features]
 # Some types that we used from cairo-vm implements the `Arbitrary` trait,

diff --git a/crates/katana/core/src/backend/gas_oracle.rs b/crates/katana/core/src/backend/gas_oracle.rs
@@ -65,14 +65,7 @@ impl GasOracle {
     ///
     /// The result of this is the same as running the node with fee disabled.
     pub fn sampled_starknet() -> Self {
-        Self::fixed(GasPrices { eth: 0, strk: 0 }, GasPrices { eth: 0, strk: 0 })
-    }
-
-    /// Returns a fixed gas oracle with zero gas prices.
-    ///
-    /// Mainly used for testing purposes.
-    pub fn zero() -> Self {
-        Self::fixed(GasPrices { eth: 0, strk: 0 }, GasPrices { eth: 0, strk: 0 })
+        Self::fixed(GasPrices { eth: 1, strk: 1 }, GasPrices { eth: 1, strk: 1 })
     }
 
     /// Returns the current gas prices.

diff --git a/crates/katana/core/tests/backend.rs b/crates/katana/core/tests/backend.rs
@@ -36,7 +36,7 @@ fn backend_with_db(chain_spec: &ChainSpec, provider: impl Database) -> Backend<B
     Backend::new(
         chain_spec.clone().into(),
         Blockchain::new(provider),
-        GasOracle::zero(),
+        GasOracle::sampled_starknet(),
         executor(chain_spec),
     )
 }

diff --git a/crates/katana/executor/Cargo.toml b/crates/katana/executor/Cargo.toml
@@ -15,7 +15,7 @@ katana-trie.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 
-blockifier = { git = "https://github.com/dojoengine/sequencer", rev = "802c5dc", features = [ "testing" ], optional = true }
+blockifier = { git = "https://github.com/dojoengine/sequencer", rev = "adae779", features = [ "testing" ], optional = true }
 parking_lot = { workspace = true, optional = true }
 starknet = { workspace = true, optional = true }
 

diff --git a/crates/katana/executor/src/implementation/blockifier/error.rs b/crates/katana/executor/src/implementation/blockifier/error.rs
@@ -1,4 +1,5 @@
 use blockifier::execution::errors::{EntryPointExecutionError, PreExecutionError};
+use blockifier::execution::execution_utils::format_panic_data;
 use blockifier::state::errors::StateError;
 use blockifier::transaction::errors::{
     TransactionExecutionError, TransactionFeeError, TransactionPreValidationError,
@@ -31,8 +32,8 @@ impl From<TransactionExecutionError> for ExecutionError {
 impl From<EntryPointExecutionError> for ExecutionError {
     fn from(error: EntryPointExecutionError) -> Self {
         match error {
-            EntryPointExecutionError::ExecutionFailed { error_trace } => {
-                Self::ExecutionFailed { reason: error_trace.to_string() }
+            EntryPointExecutionError::ExecutionFailed { error_data } => {
+                Self::ExecutionFailed { reason: format_panic_data(&error_data) }
             }
             EntryPointExecutionError::InvalidExecutionInput { input_descriptor, info } => {
                 Self::InvalidInput { input_descriptor, info }