Fix gas price

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next release
 
+- feat: actual estimate_fee added, brought back l1 messages
 - fix: starknet_call errs if contract nonexistent
 - fix: txn hash calculation and refactor
 - chore: remove all da/settlement related code

Cargo.toml

@@ -1,63 +1,63 @@
 [workspace]
 resolver = "2"
 members = [
-  "crates/node",
-  "crates/runtime",
-  "crates/pallets/starknet/runtime_api/",
-  "crates/pallets/starknet",
-  "crates/primitives/genesis-config/",
-  "crates/primitives/digest-log",
-  "crates/primitives/snos-output",
-  "crates/primitives/transactions",
-  "crates/primitives/felt",
-  "crates/primitives/hashers",
-  "crates/primitives/block",
-  "crates/primitives/sequencer-address",
-  "crates/primitives/storage",
-  "crates/primitives/chain-id",
-  "crates/primitives/messages",
-  "crates/primitives/program-hash",
-  "crates/client/genesis-data-provider",
-  "crates/client/db",
-  "crates/client/rpc-core",
-  "crates/client/rpc",
-  "crates/client/mapping-sync",
-  "crates/client/storage",
-  "crates/client/commitment-state-diff",
-  "crates/client/eth-client",
-  "crates/client/starknet-block-import",
-  "starknet-rpc-test",
-  "madara-test-runner",
-  "starknet-test-utils",
+    "crates/node",
+    "crates/runtime",
+    "crates/pallets/starknet/runtime_api/",
+    "crates/pallets/starknet",
+    "crates/primitives/genesis-config/",
+    "crates/primitives/digest-log",
+    "crates/primitives/snos-output",
+    "crates/primitives/transactions",
+    "crates/primitives/felt",
+    "crates/primitives/hashers",
+    "crates/primitives/block",
+    "crates/primitives/starknet-inherent",
+    "crates/primitives/storage",
+    "crates/primitives/chain-id",
+    "crates/primitives/messages",
+    "crates/primitives/program-hash",
+    "crates/client/genesis-data-provider",
+    "crates/client/db",
+    "crates/client/rpc-core",
+    "crates/client/rpc",
+    "crates/client/mapping-sync",
+    "crates/client/storage",
+    "crates/client/commitment-state-diff",
+    "crates/client/eth-client",
+    "crates/client/starknet-block-import",
+    "starknet-rpc-test",
+    "madara-test-runner",
+    "starknet-test-utils",
 ]
 # All previous except for `starknet-rpc-test`
 # We don't want `cargo test` to trigger its tests
 default-members = [
-  "crates/node",
-  "crates/runtime",
-  "crates/pallets/starknet/runtime_api/",
-  "crates/pallets/starknet",
-  "crates/primitives/genesis-config/",
-  "crates/primitives/digest-log",
-  "crates/primitives/transactions",
-  "crates/primitives/felt",
-  "crates/primitives/hashers",
-  "crates/primitives/block",
-  "crates/primitives/sequencer-address",
-  "crates/primitives/storage",
-  "crates/primitives/chain-id",
-  "crates/primitives/messages",
-  "crates/primitives/program-hash",
-  "crates/client/genesis-data-provider",
-  "crates/client/db",
-  "crates/client/rpc-core",
-  "crates/client/rpc",
-  "crates/client/mapping-sync",
-  "crates/client/storage",
-  "crates/client/commitment-state-diff",
-  "crates/client/eth-client",
-  "crates/client/starknet-block-import",
-  "starknet-test-utils",
+    "crates/node",
+    "crates/runtime",
+    "crates/pallets/starknet/runtime_api/",
+    "crates/pallets/starknet",
+    "crates/primitives/genesis-config/",
+    "crates/primitives/digest-log",
+    "crates/primitives/transactions",
+    "crates/primitives/felt",
+    "crates/primitives/hashers",
+    "crates/primitives/block",
+    "crates/primitives/starknet-inherent",
+    "crates/primitives/storage",
+    "crates/primitives/chain-id",
+    "crates/primitives/messages",
+    "crates/primitives/program-hash",
+    "crates/client/genesis-data-provider",
+    "crates/client/db",
+    "crates/client/rpc-core",
+    "crates/client/rpc",
+    "crates/client/mapping-sync",
+    "crates/client/storage",
+    "crates/client/commitment-state-diff",
+    "crates/client/eth-client",
+    "crates/client/starknet-block-import",
+    "starknet-test-utils",
 ]
 
 [profile.release]
@@ -164,7 +164,7 @@ mp-block = { path = "crates/primitives/block" }
 mp-fee = { path = "crates/primitives/fee" }
 mp-felt = { path = "crates/primitives/felt" }
 mp-hashers = { path = "crates/primitives/hashers" }
-mp-sequencer-address = { path = "crates/primitives/sequencer-address" }
+mp-starknet-inherent = { path = "crates/primitives/starknet-inherent" }
 mp-snos-output = { path = "crates/primitives/snos-output" }
 mp-storage = { path = "crates/primitives/storage" }
 mp-transactions = { path = "crates/primitives/transactions" }
@@ -185,6 +185,7 @@ mc-rpc = { path = "crates/client/rpc" }
 mc-rpc-core = { path = "crates/client/rpc-core" }
 mc-commitment-state-diff = { path = "crates/client/commitment-state-diff" }
 mc-l1-messages = { path = "crates/client/l1-messages" }
+mc-l1-gas-price = { path = "crates/client/l1-gas-price" }
 mc-eth-client = { path = "crates/client/eth-client" }
 mc-starknet-block-import = { path = "crates/client/starknet-block-import" }
 
@@ -197,8 +198,8 @@ madara-test-runner = { path = "madara-test-runner" }
 # Starknet dependencies
 # Cairo Virtual Machine
 cairo-vm = { git = "https://github.com/bidzyyys/cairo-vm", branch = "feature/scale-codec", features = [
-  "cairo-1-hints",
-  "parity-scale-codec",
+    "cairo-1-hints",
+    "parity-scale-codec",
 ] }
 starknet-crypto = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "2d59636911628260fa460179010bbd00e89de06e" }
 starknet-core = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "2d59636911628260fa460179010bbd00e89de06e" }
@@ -208,10 +209,10 @@ starknet-signers = { git = "https://github.com/xJonathanLEI/starknet-rs.git", re
 starknet-accounts = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "2d59636911628260fa460179010bbd00e89de06e" }
 starknet-contract = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "2d59636911628260fa460179010bbd00e89de06e" }
 
-blockifier = { git = "https://github.com/bidzyyys/blockifier", branch = "feature/scale-codec" }
+blockifier = { git = "https://github.com/apoorvsadana/blockifier", branch = "scale_code_fee_type" }
 starknet_api = { git = "https://github.com/bidzyyys/starknet-api", branch = "feature/scale-codec", features = [
-  "testing",
-  "parity-scale-codec",
+    "testing",
+    "parity-scale-codec",
 ] }
 
 # Cairo lang
@@ -225,15 +226,7 @@ ethers = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533f
 ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
 
 # Zaun
-ethereum-instance = { git = "https://github.com/keep-starknet-strange/zaun", package = "ethereum-instance", branch = "main" }
-starkgate-manager-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starkgate-manager-client", branch = "main" }
-starkgate-registry-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starkgate-registry-client", branch = "main" }
 starknet-core-contract-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starknet-core-contract-client", branch = "main" }
-starknet-erc20-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starknet-erc20-client", branch = "main" }
-starknet-eth-bridge-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starknet-eth-bridge-client", branch = "main" }
-starknet-proxy-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starknet-proxy-client", branch = "main" }
-starknet-token-bridge-client = { git = "https://github.com/keep-starknet-strange/zaun", package = "starknet-token-bridge-client", branch = "main" }
-zaun-utils = { git = "https://github.com/keep-starknet-strange/zaun", package = "utils", branch = "main" }
 
 
 # Other third party dependencies

crates/client/eth-client/src/config.rs

@@ -66,6 +66,8 @@ pub struct HttpProviderConfig {
     pub rpc_endpoint: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub tx_poll_interval_ms: Option<u64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub gas_price_poll_ms: Option<u64>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -90,7 +92,7 @@ fn default_private_key() -> String {
 
 impl Default for HttpProviderConfig {
     fn default() -> Self {
-        Self { rpc_endpoint: default_rpc_endpoint(), tx_poll_interval_ms: None }
+        Self { rpc_endpoint: default_rpc_endpoint(), tx_poll_interval_ms: None, gas_price_poll_ms: None }
     }
 }
 
@@ -100,6 +102,20 @@ impl Default for EthereumProviderConfig {
     }
 }
 
+impl EthereumProviderConfig {
+    pub fn rpc_endpoint(&self) -> &String {
+        match self {
+            Self::Http(config) => &config.rpc_endpoint,
+        }
+    }
+
+    pub fn gas_price_poll_ms(&self) -> Option<u64> {
+        match self {
+            Self::Http(config) => config.gas_price_poll_ms,
+        }
+    }
+}
+
 impl Default for LocalWalletConfig {
     fn default() -> Self {
         Self { chain_id: default_chain_id(), private_key: default_private_key() }

crates/client/l1-gas-price/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "mc-l1-gas-price"
+version = "0.1.0"
+description = "L1 gas price fetching library."
+homepage = "https://github.com/keep-starknet-strange/madara"
+edition = "2021"
+license = "MIT"
+publish = false
+repository = "https://github.com/keep-starknet-strange/madara"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+mc-eth-client = { workspace = true }
+ethers = { workspace = true }
+mp-starknet-inherent = { workspace = true }
+futures = { workspace = true }
+log = { workspace = true }
+tokio = { workspace = true }
+serde = { workspace = true }
+reqwest = { workspace = true }
+anyhow = { workspace = true }

crates/client/l1-gas-price/src/lib.rs

@@ -0,0 +1,2 @@
+mod types;
+pub mod worker;