Merge pull request #1796 from eqlabs/krisztian/upgrade-blockifier-0.5…

….0-rc0.3 feat(rpc): upgrade blockifier to 0.5.0-rc.3
eqlabs · Feb 22, 2024 · f22a913 · f22a913
2 parents c839d53 + 90a8bee
commit f22a913
Show file tree

Hide file tree

Showing 19 changed files with 1,499 additions and 403 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,7 @@ async-trait = "0.1.73"
 axum = { version = "0.6.19", features = ["macros"] }
 base64 = "0.13.1"
 bitvec = "1.0.1"
-blockifier = "=0.5.0-rc.1"
+blockifier = "=0.5.0-rc.3"
 bytes = "1.4.0"
 cached = "0.44.0"
 # This one needs to match the version used by blockifier

diff --git a/crates/common/src/header.rs b/crates/common/src/header.rs
@@ -118,6 +118,16 @@ impl BlockHeaderBuilder {
         self
     }
 
+    pub fn with_eth_l1_data_gas_price(mut self, eth_l1_data_gas_price: GasPrice) -> Self {
+        self.0.eth_l1_data_gas_price = eth_l1_data_gas_price;
+        self
+    }
+
+    pub fn with_strk_l1_data_gas_price(mut self, strk_l1_data_gas_price: GasPrice) -> Self {
+        self.0.strk_l1_data_gas_price = strk_l1_data_gas_price;
+        self
+    }
+
     pub fn with_sequencer_address(mut self, sequencer_address: SequencerAddress) -> Self {
         self.0.sequencer_address = sequencer_address;
         self

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -9,11 +9,11 @@ rust-version = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
-cairo-lang-starknet-classes = "=2.6.0-rc.0"
+cairo-lang-starknet-classes = "=2.6.0-rc.1"
 casm-compiler-v1_0_0-alpha6 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-alpha.6" }
 casm-compiler-v1_0_0-rc0 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-rc0" }
 casm-compiler-v1_1_1 = { package = "cairo-lang-starknet", version = "=1.1.1" }
-casm-compiler-v2 = { package = "cairo-lang-starknet", version = "=2.6.0-rc.0" }
+casm-compiler-v2 = { package = "cairo-lang-starknet", version = "=2.6.0-rc.1" }
 pathfinder-common = { path = "../common" }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }

diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
@@ -17,6 +17,8 @@ pathfinder-common = { path = "../common" }
 pathfinder-crypto = { path = "../crypto" }
 pathfinder-storage = { path = "../storage" }
 primitive-types = { workspace = true, features = ["serde"] }
+semver = { workspace = true }
+serde_json = { workspace = true }
 starknet-gateway-types = { path = "../gateway-types" }
 starknet_api = { workspace = true }
 tokio = { workspace = true }