merged conflicts

.github/workflows/starknet-js-test.yml

@@ -26,7 +26,7 @@ jobs:
           fail-on-cache-miss: true
       - name: Setup dev chain and run tests
         run: |
-          ./target/release/madara --name madara --base-path ../madara_db --rpc-port 9944 --rpc-cors "*" --rpc-external --devnet --preset devnet --gas-price 0 --blob-gas-price 0 --no-l1-sync &
+          ./target/release/madara --name madara --base-path ../madara_db --rpc-port 9944 --rpc-cors "*" --rpc-external --devnet --preset devnet --gas-price 0 --blob-gas-price 0 --strk-gas-price 0 --strk-blob-gas-price 0 --no-l1-sync &
           MADARA_PID=$!
           while ! echo exit | nc localhost 9944; do sleep 1; done
           cd tests/js_tests

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Next release
 
 - feat(services): reworked Madara services for better cancellation control
+- feat: fetch eth/strk price and sync strk gas price
 - feat(block_production): continue pending block on restart
 - feat(mempool): mempool transaction saving on db
 - feat(mempool): mempool transaction limits

Cargo.toml

@@ -116,6 +116,7 @@ mp-receipt = { path = "crates/primitives/receipt", default-features = false }
 mp-state-update = { path = "crates/primitives/state_update", default-features = false }
 mp-utils = { path = "crates/primitives/utils", default-features = false }
 mp-chain-config = { path = "crates/primitives/chain_config", default-features = false }
+mp-oracle = { path = "crates/primitives/oracle", default-features = false }
 
 # Madara client
 mc-analytics = { path = "crates/client/analytics" }
@@ -164,6 +165,7 @@ alloy = { version = "0.4.0", features = [
 # Other third party dependencies
 paste = "1.0.15"
 anyhow = "1.0"
+bigdecimal = "0.4.5"
 assert_matches = "1.5"
 async-trait = "0.1"
 base64 = "0.22"

crates/client/eth/Cargo.toml

@@ -19,24 +19,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 
 # Madara
-mc-analytics = { workspace = true }
-mc-db = { workspace = true }
-mc-mempool = { workspace = true }
-mp-chain-config = { workspace = true }
-mp-convert = { workspace = true }
-mp-transactions = { workspace = true }
-mp-utils = { workspace = true }
+mc-analytics.workspace = true
+mc-db.workspace = true
+mc-mempool.workspace = true
+mp-chain-config.workspace = true
+mp-convert.workspace = true
+mp-transactions.workspace = true
+mp-utils.workspace = true
 
 # Starknet
-starknet-types-core = { workspace = true }
-starknet_api = { workspace = true }
+starknet-types-core.workspace = true
+starknet_api.workspace = true
 
 
 # Other
-alloy = { workspace = true }
-anyhow = "1.0.75"
-bitvec = { workspace = true }
-blockifier = { workspace = true }
+alloy.workspace = true
+anyhow.workspace = true
+bigdecimal.workspace = true
+bitvec.workspace = true
 futures = { workspace = true, default-features = true }
 
 regex = "1.10.5"
@@ -50,8 +50,7 @@ tokio = { workspace = true, features = [
   "test-util",
   "signal",
 ] }
-tokio-util = { workspace = true }
-url = { workspace = true }
+url.workspace = true
 
 
 #Instrumentation
@@ -76,12 +75,12 @@ default = []
 
 
 [dev-dependencies]
-rstest = { workspace = true }
-once_cell = { workspace = true }
-tempfile = { workspace = true }
-dotenv = { workspace = true }
-httpmock = { workspace = true }
+rstest.workspace = true
+once_cell.workspace = true
+tempfile.workspace = true
+dotenv.workspace = true
+httpmock.workspace = true
 tracing-test = "0.2.5"
-serial_test = { workspace = true }
-lazy_static = { workspace = true }
+serial_test.workspace = true
+lazy_static.workspace = true
 mp-utils = { workspace = true, features = ["testing"] }