fix: override cli (madara-alliance#312)

astraly-labs · Oct 8, 2024 · 66543dd · 66543dd
1 parent f46532a
commit 66543dd
Show file tree

Hide file tree

Showing 22 changed files with 218 additions and 164 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Next release
 
+- fix: override chain config
 - fix: estimate_fee should through an error if any txn fails
 - fix: rejected transaction block production panic
 - fix(sync): pending block retrying mechanism

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/configs/chain_config.example.yaml b/configs/chain_config.example.yaml
@@ -10,7 +10,7 @@ native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
 
 # Paths to JSON files containing blockifier's constants for different versions
-versioned_constants:
+versioned_constants_path:
   "0.13.0": "crates/primitives/chain_config/resources/versioned_constants_13_0.json"
   "0.13.1": "crates/primitives/chain_config/resources/versioned_constants_13_1.json"
   "0.13.1.1": "crates/primitives/chain_config/resources/versioned_constants_13_1_1.json"

diff --git a/configs/presets/devnet.yaml b/configs/presets/devnet.yaml
@@ -2,11 +2,6 @@ chain_name: "Madara"
 chain_id: "MADARA_DEVNET"
 native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
-versioned_constants:
-  "0.13.0": "crates/primitives/chain_config/resources/versioned_constants_13_0.json"
-  "0.13.1": "crates/primitives/chain_config/resources/versioned_constants_13_1.json"
-  "0.13.1.1": "crates/primitives/chain_config/resources/versioned_constants_13_1_1.json"
-  "0.13.2": "crates/primitives/chain_config/resources/versioned_constants_13_2.json"
 eth_core_contract_address: "0xE2Bb56ee936fd6433DC0F6e7e3b8365C906AA057"
 latest_protocol_version: "0.13.2"
 block_time: "30s"

diff --git a/configs/presets/integration.yaml b/configs/presets/integration.yaml
@@ -2,11 +2,6 @@ chain_name: "Starknet Sepolia"
 chain_id: "SN_INTEGRATION_SEPOLIA"
 native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
-versioned_constants:
-  "0.13.0": "crates/primitives/chain_config/resources/versioned_constants_13_0.json"
-  "0.13.1": "crates/primitives/chain_config/resources/versioned_constants_13_1.json"
-  "0.13.1.1": "crates/primitives/chain_config/resources/versioned_constants_13_1_1.json"
-  "0.13.2": "crates/primitives/chain_config/resources/versioned_constants_13_2.json"
 eth_core_contract_address: "0x4737c0c1B4D5b1A687B42610DdabEE781152359c"
 latest_protocol_version: "0.13.2"
 block_time: "30s"
@@ -30,5 +25,5 @@ bouncer_config:
     message_segment_length: 18446744073709551615
     n_events: 18446744073709551615
     state_diff_size: 131072
-sequencer_address: "0x0"
+sequencer_address: "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"
 max_nonce_for_validation_skip: 2
diff --git a/configs/presets/mainnet.yaml b/configs/presets/mainnet.yaml
@@ -2,11 +2,6 @@ chain_name: "Starknet Mainnet"
 chain_id: "SN_MAIN"
 native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
-versioned_constants:
-  "0.13.0": "crates/primitives/chain_config/resources/versioned_constants_13_0.json"
-  "0.13.1": "crates/primitives/chain_config/resources/versioned_constants_13_1.json"
-  "0.13.1.1": "crates/primitives/chain_config/resources/versioned_constants_13_1_1.json"
-  "0.13.2": "crates/primitives/chain_config/resources/versioned_constants_13_2.json"
 eth_core_contract_address: "0xc662c410C0ECf747543f5bA90660f6ABeBD9C8c4"
 latest_protocol_version: "0.13.2"
 block_time: "30s"
@@ -30,5 +25,5 @@ bouncer_config:
     message_segment_length: 18446744073709551615
     n_events: 18446744073709551615
     state_diff_size: 131072
-sequencer_address: "0x0"
+sequencer_address: "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"
 max_nonce_for_validation_skip: 2
diff --git a/configs/presets/sepolia.yaml b/configs/presets/sepolia.yaml
@@ -2,11 +2,6 @@ chain_name: "Starknet Sepolia"
 chain_id: "SN_SEPOLIA"
 native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"
-versioned_constants:
-  "0.13.0": "crates/primitives/chain_config/resources/versioned_constants_13_0.json"
-  "0.13.1": "crates/primitives/chain_config/resources/versioned_constants_13_1.json"
-  "0.13.1.1": "crates/primitives/chain_config/resources/versioned_constants_13_1_1.json"
-  "0.13.2": "crates/primitives/chain_config/resources/versioned_constants_13_2.json"
 eth_core_contract_address: "0xE2Bb56ee936fd6433DC0F6e7e3b8365C906AA057"
 latest_protocol_version: "0.13.2"
 block_time: "30s"
@@ -30,5 +25,5 @@ bouncer_config:
     message_segment_length: 18446744073709551615
     n_events: 18446744073709551615
     state_diff_size: 131072
-sequencer_address: "0x0"
+sequencer_address: "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"
 max_nonce_for_validation_skip: 2
diff --git a/crates/client/block_import/Cargo.toml b/crates/client/block_import/Cargo.toml
@@ -31,7 +31,6 @@ mp-convert.workspace = true
 mp-receipt.workspace = true
 mp-state-update.workspace = true
 mp-transactions.workspace = true
-mp-utils.workspace = true
 
 bonsai-trie.workspace = true
 starknet-core.workspace = true

diff --git a/crates/client/db/Cargo.toml b/crates/client/db/Cargo.toml
@@ -35,7 +35,6 @@ bincode = { workspace = true }
 log = { workspace = true, default-features = true }
 rayon = { workspace = true }
 rocksdb.workspace = true
-rstest = { workspace = true }
 serde = { workspace = true }
 tempfile = { workspace = true, optional = true }
 thiserror = { workspace = true }

diff --git a/crates/client/devnet/Cargo.toml b/crates/client/devnet/Cargo.toml
@@ -37,7 +37,6 @@ mp-convert.workspace = true
 mp-receipt.workspace = true
 mp-state-update.workspace = true
 mp-transactions.workspace = true
-mp-utils.workspace = true
 
 # Starknet
 blockifier.workspace = true

diff --git a/crates/client/rpc/Cargo.toml b/crates/client/rpc/Cargo.toml
@@ -31,7 +31,6 @@ mp-convert = { workspace = true, default-features = true }
 mp-receipt = { workspace = true }
 mp-state-update = { workspace = true }
 mp-transactions = { workspace = true }
-mp-utils = { workspace = true }
 
 # Starknet
 blockifier = { workspace = true, default-features = true }

diff --git a/crates/client/sync/Cargo.toml b/crates/client/sync/Cargo.toml
@@ -28,13 +28,11 @@ mp-chain-config.workspace = true
 mp-class.workspace = true
 mp-convert.workspace = true
 mp-gateway.workspace = true
-mp-receipt.workspace = true
 mp-transactions.workspace = true
 mp-utils.workspace = true
 
 # Starknet
 starknet-core.workspace = true
-starknet-providers.workspace = true
 starknet-types-core.workspace = true
 starknet_api.workspace = true
 
@@ -43,9 +41,6 @@ starknet_api.workspace = true
 anyhow.workspace = true
 futures = { workspace = true, default-features = true }
 log.workspace = true
-num-traits.workspace = true
-rand.workspace = true
-rayon.workspace = true
 reqwest.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true

diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml
@@ -35,7 +35,6 @@ mp-utils = { workspace = true }
 
 # Starknet
 blockifier = { workspace = true }
-starknet-core = { workspace = true }
 starknet-providers = { workspace = true }
 starknet_api = { workspace = true }
 
@@ -54,7 +53,6 @@ hyper.workspace = true
 ip_network.workspace = true
 jsonrpsee.workspace = true
 log = { workspace = true }
-primitive-types.workspace = true
 rand = { workspace = true }
 rayon.workspace = true
 reqwest = { workspace = true }