From 9ed437e93a9e77f4ce699b51e3b7a726fbdd6a48 Mon Sep 17 00:00:00 2001
From: jbcaron <jbcaron.dev@gmail.com>
Date: Tue, 12 Mar 2024 17:00:11 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=9A=91=20fix=20get=5Fblock=20in=20?=
 =?UTF-8?q?starknet-rs=20due=20to=20starknet=20v0.13.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                            |  1 +
 Cargo.lock                              | 18 +++++++++---------
 crates/client/sync/src/utils/convert.rs |  4 +++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d6b2e775..ba720efcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ git # Deoxys Changelog
 
 ## Next release
 
+- fix: remove gas_price and update starknet-rs from fork (temporary fix)
 - fix(root): got state root to work (does not support class root yet)
 - refactor(substrate_hash): Substrate hash is now retrieved via rpc client in
   `l2.rs`
diff --git a/Cargo.lock b/Cargo.lock
index 3854133b2..83049b015 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4415,7 +4415,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.13",
- "socket2 0.5.5",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -7032,7 +7032,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -11122,7 +11122,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "starknet-core"
 version = "0.8.0"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "base64 0.21.5",
  "flate2",
@@ -11139,7 +11139,7 @@ dependencies = [
 [[package]]
 name = "starknet-crypto"
 version = "0.6.1"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "crypto-bigint",
  "hex",
@@ -11195,7 +11195,7 @@ dependencies = [
 [[package]]
 name = "starknet-crypto-codegen"
 version = "0.3.2"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "starknet-curve 0.4.0 (git+https://github.com/jbcaron/starknet-rs.git?branch=classes)",
  "starknet-ff 0.3.5 (git+https://github.com/jbcaron/starknet-rs.git?branch=classes)",
@@ -11225,7 +11225,7 @@ dependencies = [
 [[package]]
 name = "starknet-curve"
 version = "0.4.0"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "starknet-ff 0.3.5 (git+https://github.com/jbcaron/starknet-rs.git?branch=classes)",
 ]
@@ -11249,7 +11249,7 @@ dependencies = [
 [[package]]
 name = "starknet-ff"
 version = "0.3.5"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "ark-ff",
  "bigdecimal",
@@ -11284,7 +11284,7 @@ dependencies = [
 [[package]]
 name = "starknet-providers"
 version = "0.8.0"
-source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#629140c15e257bb3927a74e4c461246c30a748eb"
+source = "git+https://github.com/jbcaron/starknet-rs.git?branch=classes#664bfce5e9cf9e5eb7905255d5f3abafa90c9935"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -11303,7 +11303,7 @@ dependencies = [
 [[package]]
 name = "starknet-types-core"
 version = "0.0.9"
-source = "git+https://github.com/starknet-io/types-rs.git?branch=main#eae04aa3e6a3716982ce39ec7ba87a47698096dc"
+source = "git+https://github.com/starknet-io/types-rs.git?branch=main#4a7656ec081612b39579f9d38fa27af4fdc023de"
 dependencies = [
  "bitvec",
  "lambdaworks-crypto",
diff --git a/crates/client/sync/src/utils/convert.rs b/crates/client/sync/src/utils/convert.rs
index 8116d5034..ef72ea5f8 100644
--- a/crates/client/sync/src/utils/convert.rs
+++ b/crates/client/sync/src/utils/convert.rs
@@ -25,7 +25,9 @@ pub async fn block(block: p::Block) -> mp_block::Block {
     let (transaction_commitment, event_commitment) = commitments(&transactions, &events, block_number).await;
 
     let protocol_version = starknet_version(&block.starknet_version);
-    let l1_gas_price = resource_price(block.eth_l1_gas_price);
+    // TODO calculate gas_price when starknet-rs supports v0.13.1
+    // let l1_gas_price = resource_price(block.eth_l1_gas_price);
+    let l1_gas_price = resource_price(FieldElement::ZERO);
     let extra_data = block.block_hash.map(|h| sp_core::U256::from_big_endian(&h.to_bytes_be()));
 
     let header = mp_block::Header {