diff --git a/.prettierignore b/.prettierignore index 44cefddb6..491b2c5bc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ target -crates/client/sync/test-data/*.json +crates/madara/client/sync/test-data/*.json infra/Signoz cairo-artifacts diff --git a/CHANGELOG.md b/CHANGELOG.md index 969cee22e..1ac02bfcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- chore: Move crates under a madara subdir - chore(nix): resolve flake and direnv compatibility issues - fix: Gateway path fix - fix: instrumentation code diff --git a/Cargo.toml b/Cargo.toml index 12273e3be..d991919ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,58 +1,60 @@ [workspace] members = [ - "crates/client/db", - "crates/client/exec", - "crates/client/sync", - "crates/client/eth", - "crates/client/rpc", - "crates/client/gateway/client", - "crates/client/gateway/server", - "crates/client/analytics", - "crates/client/telemetry", - "crates/client/devnet", - "crates/client/mempool", - "crates/client/block_import", - "crates/node", - "crates/primitives/block", - "crates/primitives/convert", - "crates/primitives/transactions", - "crates/primitives/class", - "crates/primitives/gateway", - "crates/primitives/receipt", - "crates/primitives/state_update", - "crates/primitives/chain_config", - "crates/primitives/utils", - "crates/proc-macros", - "crates/tests", - "crates/cairo-test-contracts", - "crates/client/block_production", + # madara + "crates/madara/client/db", + "crates/madara/client/exec", + "crates/madara/client/sync", + "crates/madara/client/eth", + "crates/madara/client/rpc", + "crates/madara/client/gateway/client", + "crates/madara/client/gateway/server", + "crates/madara/client/analytics", + "crates/madara/client/telemetry", + "crates/madara/client/devnet", + "crates/madara/client/mempool", + "crates/madara/client/block_import", + "crates/madara/node", + "crates/madara/primitives/block", + "crates/madara/primitives/convert", + "crates/madara/primitives/transactions", + "crates/madara/primitives/class", + "crates/madara/primitives/gateway", + "crates/madara/primitives/receipt", + "crates/madara/primitives/state_update", + "crates/madara/primitives/chain_config", + "crates/madara/primitives/utils", + "crates/madara/proc-macros", + "crates/madara/tests", + "crates/madara/cairo-test-contracts", + "crates/madara/client/block_production", ] resolver = "2" # Everything except test-related packages, so that they are not compiled when doing `cargo build`. default-members = [ - "crates/client/db", - "crates/client/exec", - "crates/client/sync", - "crates/client/eth", - "crates/client/gateway/client", - "crates/client/gateway/server", - "crates/client/rpc", - "crates/client/telemetry", - "crates/client/devnet", - "crates/client/mempool", - "crates/client/block_import", - "crates/client/analytics", - "crates/node", - "crates/primitives/block", - "crates/primitives/convert", - "crates/primitives/transactions", - "crates/primitives/class", - "crates/primitives/gateway", - "crates/primitives/receipt", - "crates/primitives/state_update", - "crates/primitives/chain_config", - "crates/primitives/utils", - "crates/proc-macros", + # madara + "crates/madara/client/db", + "crates/madara/client/exec", + "crates/madara/client/sync", + "crates/madara/client/eth", + "crates/madara/client/gateway/client", + "crates/madara/client/gateway/server", + "crates/madara/client/rpc", + "crates/madara/client/telemetry", + "crates/madara/client/devnet", + "crates/madara/client/mempool", + "crates/madara/client/block_import", + "crates/madara/client/analytics", + "crates/madara/node", + "crates/madara/primitives/block", + "crates/madara/primitives/convert", + "crates/madara/primitives/transactions", + "crates/madara/primitives/class", + "crates/madara/primitives/gateway", + "crates/madara/primitives/receipt", + "crates/madara/primitives/state_update", + "crates/madara/primitives/chain_config", + "crates/madara/primitives/utils", + "crates/madara/proc-macros", ] [workspace.lints.rust] @@ -104,37 +106,37 @@ bonsai-trie = { default-features = false, git = "https://github.com/madara-allia ] } # Madara proc macros -m-proc-macros = { path = "crates/proc-macros", default-features = false } +m-proc-macros = { path = "crates/madara/proc-macros", default-features = false } # Madara primtitives -mp-block = { path = "crates/primitives/block", default-features = false } -mp-convert = { path = "crates/primitives/convert", default-features = false } -mp-transactions = { path = "crates/primitives/transactions", default-features = false } -mp-class = { path = "crates/primitives/class", default-features = false } -mp-gateway = { path = "crates/primitives/gateway", default-features = false } -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 } +mp-block = { path = "crates/madara/primitives/block", default-features = false } +mp-convert = { path = "crates/madara/primitives/convert", default-features = false } +mp-transactions = { path = "crates/madara/primitives/transactions", default-features = false } +mp-class = { path = "crates/madara/primitives/class", default-features = false } +mp-gateway = { path = "crates/madara/primitives/gateway", default-features = false } +mp-receipt = { path = "crates/madara/primitives/receipt", default-features = false } +mp-state-update = { path = "crates/madara/primitives/state_update", default-features = false } +mp-utils = { path = "crates/madara/primitives/utils", default-features = false } +mp-chain-config = { path = "crates/madara/primitives/chain_config", default-features = false } +mp-oracle = { path = "crates/madara/primitives/oracle", default-features = false } # Madara client -mc-analytics = { path = "crates/client/analytics" } -mc-telemetry = { path = "crates/client/telemetry" } -mc-db = { path = "crates/client/db" } -mc-exec = { path = "crates/client/exec" } -mc-rpc = { path = "crates/client/rpc" } -mc-gateway-client = { path = "crates/client/gateway/client" } -mc-gateway-server = { path = "crates/client/gateway/server" } -mc-sync = { path = "crates/client/sync" } -mc-eth = { path = "crates/client/eth" } -mc-mempool = { path = "crates/client/mempool" } -mc-block-production = { path = "crates/client/block_production" } -mc-block-import = { path = "crates/client/block_import" } -mc-devnet = { path = "crates/client/devnet" } +mc-analytics = { path = "crates/madara/client/analytics" } +mc-telemetry = { path = "crates/madara/client/telemetry" } +mc-db = { path = "crates/madara/client/db" } +mc-exec = { path = "crates/madara/client/exec" } +mc-rpc = { path = "crates/madara/client/rpc" } +mc-gateway-client = { path = "crates/madara/client/gateway/client" } +mc-gateway-server = { path = "crates/madara/client/gateway/server" } +mc-sync = { path = "crates/madara/client/sync" } +mc-eth = { path = "crates/madara/client/eth" } +mc-mempool = { path = "crates/madara/client/mempool" } +mc-block-production = { path = "crates/madara/client/block_production" } +mc-block-import = { path = "crates/madara/client/block_import" } +mc-devnet = { path = "crates/madara/client/devnet" } # Madara misc -m-cairo-test-contracts = { path = "crates/cairo-test-contracts" } +m-cairo-test-contracts = { path = "crates/madara/cairo-test-contracts" } # Starknet dependencies cairo-vm = "=1.0.1" diff --git a/crates/cairo-test-contracts/Cargo.toml b/crates/madara/cairo-test-contracts/Cargo.toml similarity index 100% rename from crates/cairo-test-contracts/Cargo.toml rename to crates/madara/cairo-test-contracts/Cargo.toml diff --git a/crates/cairo-test-contracts/build.rs b/crates/madara/cairo-test-contracts/build.rs similarity index 94% rename from crates/cairo-test-contracts/build.rs rename to crates/madara/cairo-test-contracts/build.rs index 76c98109d..1261a1f4d 100644 --- a/crates/cairo-test-contracts/build.rs +++ b/crates/madara/cairo-test-contracts/build.rs @@ -1,5 +1,5 @@ fn main() { - let cairo_project_dir = "../../cairo"; + let cairo_project_dir = "../../../cairo"; println!("cargo::rerun-if-changed={cairo_project_dir}/src"); println!("cargo::rerun-if-changed={cairo_project_dir}/Scarb.toml"); // Note: scarb build updates the Scarb.lock file, and there is no `--locked` arg to avoid diff --git a/crates/cairo-test-contracts/src/lib.rs b/crates/madara/cairo-test-contracts/src/lib.rs similarity index 68% rename from crates/cairo-test-contracts/src/lib.rs rename to crates/madara/cairo-test-contracts/src/lib.rs index b4237ce0f..c89e65522 100644 --- a/crates/cairo-test-contracts/src/lib.rs +++ b/crates/madara/cairo-test-contracts/src/lib.rs @@ -2,4 +2,4 @@ //! tests need to be put in the `cairo-artifacts` folder at the root of the project`. pub const TEST_CONTRACT_SIERRA: &[u8] = - include_bytes!("../../../cairo/target/dev/madara_contracts_TestContract.contract_class.json"); + include_bytes!("../../../../cairo/target/dev/madara_contracts_TestContract.contract_class.json"); diff --git a/crates/client/analytics/Cargo.toml b/crates/madara/client/analytics/Cargo.toml similarity index 100% rename from crates/client/analytics/Cargo.toml rename to crates/madara/client/analytics/Cargo.toml diff --git a/crates/client/analytics/src/lib.rs b/crates/madara/client/analytics/src/lib.rs similarity index 100% rename from crates/client/analytics/src/lib.rs rename to crates/madara/client/analytics/src/lib.rs diff --git a/crates/client/block_import/Cargo.toml b/crates/madara/client/block_import/Cargo.toml similarity index 100% rename from crates/client/block_import/Cargo.toml rename to crates/madara/client/block_import/Cargo.toml diff --git a/crates/client/block_import/src/lib.rs b/crates/madara/client/block_import/src/lib.rs similarity index 100% rename from crates/client/block_import/src/lib.rs rename to crates/madara/client/block_import/src/lib.rs diff --git a/crates/client/block_import/src/metrics.rs b/crates/madara/client/block_import/src/metrics.rs similarity index 100% rename from crates/client/block_import/src/metrics.rs rename to crates/madara/client/block_import/src/metrics.rs diff --git a/crates/client/block_import/src/pre_validate.rs b/crates/madara/client/block_import/src/pre_validate.rs similarity index 100% rename from crates/client/block_import/src/pre_validate.rs rename to crates/madara/client/block_import/src/pre_validate.rs diff --git a/crates/client/block_import/src/rayon.rs b/crates/madara/client/block_import/src/rayon.rs similarity index 100% rename from crates/client/block_import/src/rayon.rs rename to crates/madara/client/block_import/src/rayon.rs diff --git a/crates/client/block_import/src/tests.rs b/crates/madara/client/block_import/src/tests.rs similarity index 100% rename from crates/client/block_import/src/tests.rs rename to crates/madara/client/block_import/src/tests.rs diff --git a/crates/client/block_import/src/tests/block_import_utils.rs b/crates/madara/client/block_import/src/tests/block_import_utils.rs similarity index 100% rename from crates/client/block_import/src/tests/block_import_utils.rs rename to crates/madara/client/block_import/src/tests/block_import_utils.rs diff --git a/crates/client/block_import/src/types.rs b/crates/madara/client/block_import/src/types.rs similarity index 100% rename from crates/client/block_import/src/types.rs rename to crates/madara/client/block_import/src/types.rs diff --git a/crates/client/block_import/src/verify_apply.rs b/crates/madara/client/block_import/src/verify_apply.rs similarity index 100% rename from crates/client/block_import/src/verify_apply.rs rename to crates/madara/client/block_import/src/verify_apply.rs diff --git a/crates/client/block_import/src/verify_apply/classes.rs b/crates/madara/client/block_import/src/verify_apply/classes.rs similarity index 100% rename from crates/client/block_import/src/verify_apply/classes.rs rename to crates/madara/client/block_import/src/verify_apply/classes.rs diff --git a/crates/client/block_import/src/verify_apply/contracts.rs b/crates/madara/client/block_import/src/verify_apply/contracts.rs similarity index 100% rename from crates/client/block_import/src/verify_apply/contracts.rs rename to crates/madara/client/block_import/src/verify_apply/contracts.rs diff --git a/crates/client/block_production/Cargo.toml b/crates/madara/client/block_production/Cargo.toml similarity index 100% rename from crates/client/block_production/Cargo.toml rename to crates/madara/client/block_production/Cargo.toml diff --git a/crates/client/block_production/src/close_block.rs b/crates/madara/client/block_production/src/close_block.rs similarity index 100% rename from crates/client/block_production/src/close_block.rs rename to crates/madara/client/block_production/src/close_block.rs diff --git a/crates/client/block_production/src/finalize_execution_state.rs b/crates/madara/client/block_production/src/finalize_execution_state.rs similarity index 100% rename from crates/client/block_production/src/finalize_execution_state.rs rename to crates/madara/client/block_production/src/finalize_execution_state.rs diff --git a/crates/client/block_production/src/lib.rs b/crates/madara/client/block_production/src/lib.rs similarity index 100% rename from crates/client/block_production/src/lib.rs rename to crates/madara/client/block_production/src/lib.rs diff --git a/crates/client/block_production/src/metrics.rs b/crates/madara/client/block_production/src/metrics.rs similarity index 100% rename from crates/client/block_production/src/metrics.rs rename to crates/madara/client/block_production/src/metrics.rs diff --git a/crates/client/block_production/src/re_add_finalized_to_blockifier.rs b/crates/madara/client/block_production/src/re_add_finalized_to_blockifier.rs similarity index 100% rename from crates/client/block_production/src/re_add_finalized_to_blockifier.rs rename to crates/madara/client/block_production/src/re_add_finalized_to_blockifier.rs diff --git a/crates/client/db/Cargo.toml b/crates/madara/client/db/Cargo.toml similarity index 100% rename from crates/client/db/Cargo.toml rename to crates/madara/client/db/Cargo.toml diff --git a/crates/client/db/docs/flat_storage.md b/crates/madara/client/db/docs/flat_storage.md similarity index 100% rename from crates/client/db/docs/flat_storage.md rename to crates/madara/client/db/docs/flat_storage.md diff --git a/crates/client/db/docs/flat_storage.png b/crates/madara/client/db/docs/flat_storage.png similarity index 100% rename from crates/client/db/docs/flat_storage.png rename to crates/madara/client/db/docs/flat_storage.png diff --git a/crates/client/db/docs/flat_storage_iterator.png b/crates/madara/client/db/docs/flat_storage_iterator.png similarity index 100% rename from crates/client/db/docs/flat_storage_iterator.png rename to crates/madara/client/db/docs/flat_storage_iterator.png diff --git a/crates/client/db/src/block_db.rs b/crates/madara/client/db/src/block_db.rs similarity index 100% rename from crates/client/db/src/block_db.rs rename to crates/madara/client/db/src/block_db.rs diff --git a/crates/client/db/src/bonsai_db.rs b/crates/madara/client/db/src/bonsai_db.rs similarity index 100% rename from crates/client/db/src/bonsai_db.rs rename to crates/madara/client/db/src/bonsai_db.rs diff --git a/crates/client/db/src/class_db.rs b/crates/madara/client/db/src/class_db.rs similarity index 100% rename from crates/client/db/src/class_db.rs rename to crates/madara/client/db/src/class_db.rs diff --git a/crates/client/db/src/contract_db.rs b/crates/madara/client/db/src/contract_db.rs similarity index 100% rename from crates/client/db/src/contract_db.rs rename to crates/madara/client/db/src/contract_db.rs diff --git a/crates/client/db/src/db_block_id.rs b/crates/madara/client/db/src/db_block_id.rs similarity index 100% rename from crates/client/db/src/db_block_id.rs rename to crates/madara/client/db/src/db_block_id.rs diff --git a/crates/client/db/src/db_metrics.rs b/crates/madara/client/db/src/db_metrics.rs similarity index 100% rename from crates/client/db/src/db_metrics.rs rename to crates/madara/client/db/src/db_metrics.rs diff --git a/crates/client/db/src/devnet_db.rs b/crates/madara/client/db/src/devnet_db.rs similarity index 100% rename from crates/client/db/src/devnet_db.rs rename to crates/madara/client/db/src/devnet_db.rs diff --git a/crates/client/db/src/error.rs b/crates/madara/client/db/src/error.rs similarity index 100% rename from crates/client/db/src/error.rs rename to crates/madara/client/db/src/error.rs diff --git a/crates/client/db/src/l1_db.rs b/crates/madara/client/db/src/l1_db.rs similarity index 100% rename from crates/client/db/src/l1_db.rs rename to crates/madara/client/db/src/l1_db.rs diff --git a/crates/client/db/src/lib.rs b/crates/madara/client/db/src/lib.rs similarity index 100% rename from crates/client/db/src/lib.rs rename to crates/madara/client/db/src/lib.rs diff --git a/crates/client/db/src/mempool_db.rs b/crates/madara/client/db/src/mempool_db.rs similarity index 100% rename from crates/client/db/src/mempool_db.rs rename to crates/madara/client/db/src/mempool_db.rs diff --git a/crates/client/db/src/rocksdb_options.rs b/crates/madara/client/db/src/rocksdb_options.rs similarity index 100% rename from crates/client/db/src/rocksdb_options.rs rename to crates/madara/client/db/src/rocksdb_options.rs diff --git a/crates/client/db/src/rocksdb_snapshot.rs b/crates/madara/client/db/src/rocksdb_snapshot.rs similarity index 100% rename from crates/client/db/src/rocksdb_snapshot.rs rename to crates/madara/client/db/src/rocksdb_snapshot.rs diff --git a/crates/client/db/src/snapshots.rs b/crates/madara/client/db/src/snapshots.rs similarity index 100% rename from crates/client/db/src/snapshots.rs rename to crates/madara/client/db/src/snapshots.rs diff --git a/crates/client/db/src/storage_updates.rs b/crates/madara/client/db/src/storage_updates.rs similarity index 100% rename from crates/client/db/src/storage_updates.rs rename to crates/madara/client/db/src/storage_updates.rs diff --git a/crates/client/db/src/tests.rs b/crates/madara/client/db/src/tests.rs similarity index 100% rename from crates/client/db/src/tests.rs rename to crates/madara/client/db/src/tests.rs diff --git a/crates/client/db/src/tests/common/mod.rs b/crates/madara/client/db/src/tests/common/mod.rs similarity index 100% rename from crates/client/db/src/tests/common/mod.rs rename to crates/madara/client/db/src/tests/common/mod.rs diff --git a/crates/client/db/src/tests/test_block.rs b/crates/madara/client/db/src/tests/test_block.rs similarity index 100% rename from crates/client/db/src/tests/test_block.rs rename to crates/madara/client/db/src/tests/test_block.rs diff --git a/crates/client/db/src/tests/test_open.rs b/crates/madara/client/db/src/tests/test_open.rs similarity index 100% rename from crates/client/db/src/tests/test_open.rs rename to crates/madara/client/db/src/tests/test_open.rs diff --git a/crates/client/devnet/Cargo.toml b/crates/madara/client/devnet/Cargo.toml similarity index 100% rename from crates/client/devnet/Cargo.toml rename to crates/madara/client/devnet/Cargo.toml diff --git a/crates/client/devnet/README.md b/crates/madara/client/devnet/README.md similarity index 100% rename from crates/client/devnet/README.md rename to crates/madara/client/devnet/README.md diff --git a/crates/client/devnet/src/balances.rs b/crates/madara/client/devnet/src/balances.rs similarity index 100% rename from crates/client/devnet/src/balances.rs rename to crates/madara/client/devnet/src/balances.rs diff --git a/crates/client/devnet/src/classes.rs b/crates/madara/client/devnet/src/classes.rs similarity index 100% rename from crates/client/devnet/src/classes.rs rename to crates/madara/client/devnet/src/classes.rs diff --git a/crates/client/devnet/src/contracts.rs b/crates/madara/client/devnet/src/contracts.rs similarity index 100% rename from crates/client/devnet/src/contracts.rs rename to crates/madara/client/devnet/src/contracts.rs diff --git a/crates/client/devnet/src/entrypoint.rs b/crates/madara/client/devnet/src/entrypoint.rs similarity index 100% rename from crates/client/devnet/src/entrypoint.rs rename to crates/madara/client/devnet/src/entrypoint.rs diff --git a/crates/client/devnet/src/lib.rs b/crates/madara/client/devnet/src/lib.rs similarity index 99% rename from crates/client/devnet/src/lib.rs rename to crates/madara/client/devnet/src/lib.rs index f62be8c00..36ddf28b0 100644 --- a/crates/client/devnet/src/lib.rs +++ b/crates/madara/client/devnet/src/lib.rs @@ -52,19 +52,19 @@ impl StorageDiffs { // We allow ourselves to lie about the contract_address. This is because we want the UDC and the two ERC20 contracts to have well known addresses on every chain. /// Universal Deployer Contract. -const UDC_CLASS_DEFINITION: &[u8] = include_bytes!("../../../../cairo-artifacts/madara_contracts_UDC.json"); +const UDC_CLASS_DEFINITION: &[u8] = include_bytes!("../../../../../cairo-artifacts/madara_contracts_UDC.json"); const UDC_CONTRACT_ADDRESS: Felt = Felt::from_hex_unchecked("0x041a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf"); const ERC20_CLASS_DEFINITION: &[u8] = - include_bytes!("../../../../cairo-artifacts/openzeppelin_ERC20Upgradeable.contract_class.json"); + include_bytes!("../../../../../cairo-artifacts/openzeppelin_ERC20Upgradeable.contract_class.json"); const ERC20_STRK_CONTRACT_ADDRESS: Felt = Felt::from_hex_unchecked("0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"); const ERC20_ETH_CONTRACT_ADDRESS: Felt = Felt::from_hex_unchecked("0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"); const ACCOUNT_CLASS_DEFINITION: &[u8] = - include_bytes!("../../../../cairo-artifacts/openzeppelin_AccountUpgradeable.contract_class.json"); + include_bytes!("../../../../../cairo-artifacts/openzeppelin_AccountUpgradeable.contract_class.json"); /// High level description of the genesis block. #[derive(Clone, Debug, Default)] diff --git a/crates/client/devnet/src/predeployed_contracts.rs b/crates/madara/client/devnet/src/predeployed_contracts.rs similarity index 100% rename from crates/client/devnet/src/predeployed_contracts.rs rename to crates/madara/client/devnet/src/predeployed_contracts.rs diff --git a/crates/client/eth/Cargo.toml b/crates/madara/client/eth/Cargo.toml similarity index 100% rename from crates/client/eth/Cargo.toml rename to crates/madara/client/eth/Cargo.toml diff --git a/crates/client/eth/README.md b/crates/madara/client/eth/README.md similarity index 100% rename from crates/client/eth/README.md rename to crates/madara/client/eth/README.md diff --git a/crates/client/eth/src/abis/starknet_core.json b/crates/madara/client/eth/src/abis/starknet_core.json similarity index 100% rename from crates/client/eth/src/abis/starknet_core.json rename to crates/madara/client/eth/src/abis/starknet_core.json diff --git a/crates/client/eth/src/client.rs b/crates/madara/client/eth/src/client.rs similarity index 100% rename from crates/client/eth/src/client.rs rename to crates/madara/client/eth/src/client.rs diff --git a/crates/client/eth/src/error.rs b/crates/madara/client/eth/src/error.rs similarity index 100% rename from crates/client/eth/src/error.rs rename to crates/madara/client/eth/src/error.rs diff --git a/crates/client/eth/src/l1_gas_price.rs b/crates/madara/client/eth/src/l1_gas_price.rs similarity index 100% rename from crates/client/eth/src/l1_gas_price.rs rename to crates/madara/client/eth/src/l1_gas_price.rs diff --git a/crates/client/eth/src/l1_messaging.rs b/crates/madara/client/eth/src/l1_messaging.rs similarity index 100% rename from crates/client/eth/src/l1_messaging.rs rename to crates/madara/client/eth/src/l1_messaging.rs diff --git a/crates/client/eth/src/lib.rs b/crates/madara/client/eth/src/lib.rs similarity index 100% rename from crates/client/eth/src/lib.rs rename to crates/madara/client/eth/src/lib.rs diff --git a/crates/client/eth/src/state_update.rs b/crates/madara/client/eth/src/state_update.rs similarity index 100% rename from crates/client/eth/src/state_update.rs rename to crates/madara/client/eth/src/state_update.rs diff --git a/crates/client/eth/src/sync.rs b/crates/madara/client/eth/src/sync.rs similarity index 100% rename from crates/client/eth/src/sync.rs rename to crates/madara/client/eth/src/sync.rs diff --git a/crates/client/eth/src/utils.rs b/crates/madara/client/eth/src/utils.rs similarity index 100% rename from crates/client/eth/src/utils.rs rename to crates/madara/client/eth/src/utils.rs diff --git a/crates/client/exec/Cargo.toml b/crates/madara/client/exec/Cargo.toml similarity index 100% rename from crates/client/exec/Cargo.toml rename to crates/madara/client/exec/Cargo.toml diff --git a/crates/client/exec/src/block_context.rs b/crates/madara/client/exec/src/block_context.rs similarity index 100% rename from crates/client/exec/src/block_context.rs rename to crates/madara/client/exec/src/block_context.rs diff --git a/crates/client/exec/src/blockifier_state_adapter.rs b/crates/madara/client/exec/src/blockifier_state_adapter.rs similarity index 100% rename from crates/client/exec/src/blockifier_state_adapter.rs rename to crates/madara/client/exec/src/blockifier_state_adapter.rs diff --git a/crates/client/exec/src/call.rs b/crates/madara/client/exec/src/call.rs similarity index 100% rename from crates/client/exec/src/call.rs rename to crates/madara/client/exec/src/call.rs diff --git a/crates/client/exec/src/execution.rs b/crates/madara/client/exec/src/execution.rs similarity index 100% rename from crates/client/exec/src/execution.rs rename to crates/madara/client/exec/src/execution.rs diff --git a/crates/client/exec/src/fee.rs b/crates/madara/client/exec/src/fee.rs similarity index 100% rename from crates/client/exec/src/fee.rs rename to crates/madara/client/exec/src/fee.rs diff --git a/crates/client/exec/src/lib.rs b/crates/madara/client/exec/src/lib.rs similarity index 100% rename from crates/client/exec/src/lib.rs rename to crates/madara/client/exec/src/lib.rs diff --git a/crates/client/exec/src/trace.rs b/crates/madara/client/exec/src/trace.rs similarity index 100% rename from crates/client/exec/src/trace.rs rename to crates/madara/client/exec/src/trace.rs diff --git a/crates/client/exec/src/transaction.rs b/crates/madara/client/exec/src/transaction.rs similarity index 100% rename from crates/client/exec/src/transaction.rs rename to crates/madara/client/exec/src/transaction.rs diff --git a/crates/client/gateway/client/Cargo.toml b/crates/madara/client/gateway/client/Cargo.toml similarity index 100% rename from crates/client/gateway/client/Cargo.toml rename to crates/madara/client/gateway/client/Cargo.toml diff --git a/crates/client/gateway/client/src/builder.rs b/crates/madara/client/gateway/client/src/builder.rs similarity index 100% rename from crates/client/gateway/client/src/builder.rs rename to crates/madara/client/gateway/client/src/builder.rs diff --git a/crates/client/gateway/client/src/lib.rs b/crates/madara/client/gateway/client/src/lib.rs similarity index 100% rename from crates/client/gateway/client/src/lib.rs rename to crates/madara/client/gateway/client/src/lib.rs diff --git a/crates/client/gateway/client/src/methods.rs b/crates/madara/client/gateway/client/src/methods.rs similarity index 100% rename from crates/client/gateway/client/src/methods.rs rename to crates/madara/client/gateway/client/src/methods.rs diff --git a/crates/client/gateway/client/src/mocks/class_block_0_0x010455c752b86932ce552f2b0fe81a880746649b9aee7e0d842bf3f52378f9f8.gz b/crates/madara/client/gateway/client/src/mocks/class_block_0_0x010455c752b86932ce552f2b0fe81a880746649b9aee7e0d842bf3f52378f9f8.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_0_0x010455c752b86932ce552f2b0fe81a880746649b9aee7e0d842bf3f52378f9f8.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_0_0x010455c752b86932ce552f2b0fe81a880746649b9aee7e0d842bf3f52378f9f8.gz diff --git a/crates/client/gateway/client/src/mocks/class_block_1342_account_0x07595b4f7d50010ceb00230d8b5656e3c3dd201b6df35d805d3f2988c69a1432.gz b/crates/madara/client/gateway/client/src/mocks/class_block_1342_account_0x07595b4f7d50010ceb00230d8b5656e3c3dd201b6df35d805d3f2988c69a1432.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_1342_account_0x07595b4f7d50010ceb00230d8b5656e3c3dd201b6df35d805d3f2988c69a1432.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_1342_account_0x07595b4f7d50010ceb00230d8b5656e3c3dd201b6df35d805d3f2988c69a1432.gz diff --git a/crates/client/gateway/client/src/mocks/class_block_1343_proxy_0x071c3c99f5cf76fc19945d4b8b7d34c7c5528f22730d56192b50c6bbfd338a64.gz b/crates/madara/client/gateway/client/src/mocks/class_block_1343_proxy_0x071c3c99f5cf76fc19945d4b8b7d34c7c5528f22730d56192b50c6bbfd338a64.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_1343_proxy_0x071c3c99f5cf76fc19945d4b8b7d34c7c5528f22730d56192b50c6bbfd338a64.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_1343_proxy_0x071c3c99f5cf76fc19945d4b8b7d34c7c5528f22730d56192b50c6bbfd338a64.gz diff --git a/crates/client/gateway/client/src/mocks/class_block_18507_erc1155_0x04be7f1bace6f593abd8e56947c11151f45498030748a950fdaf0b79ac3dc03f.gz b/crates/madara/client/gateway/client/src/mocks/class_block_18507_erc1155_0x04be7f1bace6f593abd8e56947c11151f45498030748a950fdaf0b79ac3dc03f.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_18507_erc1155_0x04be7f1bace6f593abd8e56947c11151f45498030748a950fdaf0b79ac3dc03f.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_18507_erc1155_0x04be7f1bace6f593abd8e56947c11151f45498030748a950fdaf0b79ac3dc03f.gz diff --git a/crates/client/gateway/client/src/mocks/class_block_1981_erc20_0x07543f8eb21f10b1827a495084697a519274ac9c1a1fbf931bac40133a6b9c15.gz b/crates/madara/client/gateway/client/src/mocks/class_block_1981_erc20_0x07543f8eb21f10b1827a495084697a519274ac9c1a1fbf931bac40133a6b9c15.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_1981_erc20_0x07543f8eb21f10b1827a495084697a519274ac9c1a1fbf931bac40133a6b9c15.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_1981_erc20_0x07543f8eb21f10b1827a495084697a519274ac9c1a1fbf931bac40133a6b9c15.gz diff --git a/crates/client/gateway/client/src/mocks/class_block_3125_erc721_0x074a7ed7f1236225600f355efe70812129658c82c295ff0f8307b3fad4bf09a9.gz b/crates/madara/client/gateway/client/src/mocks/class_block_3125_erc721_0x074a7ed7f1236225600f355efe70812129658c82c295ff0f8307b3fad4bf09a9.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/class_block_3125_erc721_0x074a7ed7f1236225600f355efe70812129658c82c295ff0f8307b3fad4bf09a9.gz rename to crates/madara/client/gateway/client/src/mocks/class_block_3125_erc721_0x074a7ed7f1236225600f355efe70812129658c82c295ff0f8307b3fad4bf09a9.gz diff --git a/crates/client/gateway/client/src/mocks/signature_block_0.gz b/crates/madara/client/gateway/client/src/mocks/signature_block_0.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/signature_block_0.gz rename to crates/madara/client/gateway/client/src/mocks/signature_block_0.gz diff --git a/crates/client/gateway/client/src/mocks/signature_block_1.gz b/crates/madara/client/gateway/client/src/mocks/signature_block_1.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/signature_block_1.gz rename to crates/madara/client/gateway/client/src/mocks/signature_block_1.gz diff --git a/crates/client/gateway/client/src/mocks/signature_block_2.gz b/crates/madara/client/gateway/client/src/mocks/signature_block_2.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/signature_block_2.gz rename to crates/madara/client/gateway/client/src/mocks/signature_block_2.gz diff --git a/crates/client/gateway/client/src/mocks/state_update_and_block_0.gz b/crates/madara/client/gateway/client/src/mocks/state_update_and_block_0.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/state_update_and_block_0.gz rename to crates/madara/client/gateway/client/src/mocks/state_update_and_block_0.gz diff --git a/crates/client/gateway/client/src/mocks/state_update_and_block_1.gz b/crates/madara/client/gateway/client/src/mocks/state_update_and_block_1.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/state_update_and_block_1.gz rename to crates/madara/client/gateway/client/src/mocks/state_update_and_block_1.gz diff --git a/crates/client/gateway/client/src/mocks/state_update_and_block_2.gz b/crates/madara/client/gateway/client/src/mocks/state_update_and_block_2.gz similarity index 100% rename from crates/client/gateway/client/src/mocks/state_update_and_block_2.gz rename to crates/madara/client/gateway/client/src/mocks/state_update_and_block_2.gz diff --git a/crates/client/gateway/client/src/request_builder.rs b/crates/madara/client/gateway/client/src/request_builder.rs similarity index 100% rename from crates/client/gateway/client/src/request_builder.rs rename to crates/madara/client/gateway/client/src/request_builder.rs diff --git a/crates/client/gateway/server/Cargo.toml b/crates/madara/client/gateway/server/Cargo.toml similarity index 100% rename from crates/client/gateway/server/Cargo.toml rename to crates/madara/client/gateway/server/Cargo.toml diff --git a/crates/client/gateway/server/src/error.rs b/crates/madara/client/gateway/server/src/error.rs similarity index 100% rename from crates/client/gateway/server/src/error.rs rename to crates/madara/client/gateway/server/src/error.rs diff --git a/crates/client/gateway/server/src/handler.rs b/crates/madara/client/gateway/server/src/handler.rs similarity index 100% rename from crates/client/gateway/server/src/handler.rs rename to crates/madara/client/gateway/server/src/handler.rs diff --git a/crates/client/gateway/server/src/helpers.rs b/crates/madara/client/gateway/server/src/helpers.rs similarity index 100% rename from crates/client/gateway/server/src/helpers.rs rename to crates/madara/client/gateway/server/src/helpers.rs diff --git a/crates/client/gateway/server/src/lib.rs b/crates/madara/client/gateway/server/src/lib.rs similarity index 100% rename from crates/client/gateway/server/src/lib.rs rename to crates/madara/client/gateway/server/src/lib.rs diff --git a/crates/client/gateway/server/src/router.rs b/crates/madara/client/gateway/server/src/router.rs similarity index 100% rename from crates/client/gateway/server/src/router.rs rename to crates/madara/client/gateway/server/src/router.rs diff --git a/crates/client/gateway/server/src/service.rs b/crates/madara/client/gateway/server/src/service.rs similarity index 100% rename from crates/client/gateway/server/src/service.rs rename to crates/madara/client/gateway/server/src/service.rs diff --git a/crates/client/mempool/Cargo.toml b/crates/madara/client/mempool/Cargo.toml similarity index 100% rename from crates/client/mempool/Cargo.toml rename to crates/madara/client/mempool/Cargo.toml diff --git a/crates/client/mempool/proptest-regressions/inner.txt b/crates/madara/client/mempool/proptest-regressions/inner.txt similarity index 100% rename from crates/client/mempool/proptest-regressions/inner.txt rename to crates/madara/client/mempool/proptest-regressions/inner.txt diff --git a/crates/client/mempool/src/header.rs b/crates/madara/client/mempool/src/header.rs similarity index 100% rename from crates/client/mempool/src/header.rs rename to crates/madara/client/mempool/src/header.rs diff --git a/crates/client/mempool/src/inner/deployed_contracts.rs b/crates/madara/client/mempool/src/inner/deployed_contracts.rs similarity index 100% rename from crates/client/mempool/src/inner/deployed_contracts.rs rename to crates/madara/client/mempool/src/inner/deployed_contracts.rs diff --git a/crates/client/mempool/src/inner/limits.rs b/crates/madara/client/mempool/src/inner/limits.rs similarity index 100% rename from crates/client/mempool/src/inner/limits.rs rename to crates/madara/client/mempool/src/inner/limits.rs diff --git a/crates/client/mempool/src/inner/mod.rs b/crates/madara/client/mempool/src/inner/mod.rs similarity index 100% rename from crates/client/mempool/src/inner/mod.rs rename to crates/madara/client/mempool/src/inner/mod.rs diff --git a/crates/client/mempool/src/inner/nonce_chain.rs b/crates/madara/client/mempool/src/inner/nonce_chain.rs similarity index 100% rename from crates/client/mempool/src/inner/nonce_chain.rs rename to crates/madara/client/mempool/src/inner/nonce_chain.rs diff --git a/crates/client/mempool/src/inner/proptest.rs b/crates/madara/client/mempool/src/inner/proptest.rs similarity index 100% rename from crates/client/mempool/src/inner/proptest.rs rename to crates/madara/client/mempool/src/inner/proptest.rs diff --git a/crates/client/mempool/src/inner/tx.rs b/crates/madara/client/mempool/src/inner/tx.rs similarity index 100% rename from crates/client/mempool/src/inner/tx.rs rename to crates/madara/client/mempool/src/inner/tx.rs diff --git a/crates/client/mempool/src/l1.rs b/crates/madara/client/mempool/src/l1.rs similarity index 100% rename from crates/client/mempool/src/l1.rs rename to crates/madara/client/mempool/src/l1.rs diff --git a/crates/client/mempool/src/lib.rs b/crates/madara/client/mempool/src/lib.rs similarity index 100% rename from crates/client/mempool/src/lib.rs rename to crates/madara/client/mempool/src/lib.rs diff --git a/crates/client/mempool/src/metrics.rs b/crates/madara/client/mempool/src/metrics.rs similarity index 100% rename from crates/client/mempool/src/metrics.rs rename to crates/madara/client/mempool/src/metrics.rs diff --git a/crates/client/mempool/src/tx.rs b/crates/madara/client/mempool/src/tx.rs similarity index 100% rename from crates/client/mempool/src/tx.rs rename to crates/madara/client/mempool/src/tx.rs diff --git a/crates/client/rpc/Cargo.toml b/crates/madara/client/rpc/Cargo.toml similarity index 100% rename from crates/client/rpc/Cargo.toml rename to crates/madara/client/rpc/Cargo.toml diff --git a/crates/client/rpc/src/RPC.md b/crates/madara/client/rpc/src/RPC.md similarity index 100% rename from crates/client/rpc/src/RPC.md rename to crates/madara/client/rpc/src/RPC.md diff --git a/crates/client/rpc/src/constants.rs b/crates/madara/client/rpc/src/constants.rs similarity index 100% rename from crates/client/rpc/src/constants.rs rename to crates/madara/client/rpc/src/constants.rs diff --git a/crates/client/rpc/src/errors.rs b/crates/madara/client/rpc/src/errors.rs similarity index 100% rename from crates/client/rpc/src/errors.rs rename to crates/madara/client/rpc/src/errors.rs diff --git a/crates/client/rpc/src/lib.rs b/crates/madara/client/rpc/src/lib.rs similarity index 100% rename from crates/client/rpc/src/lib.rs rename to crates/madara/client/rpc/src/lib.rs diff --git a/crates/client/rpc/src/providers/forward_to_provider.rs b/crates/madara/client/rpc/src/providers/forward_to_provider.rs similarity index 100% rename from crates/client/rpc/src/providers/forward_to_provider.rs rename to crates/madara/client/rpc/src/providers/forward_to_provider.rs diff --git a/crates/client/rpc/src/providers/mempool.rs b/crates/madara/client/rpc/src/providers/mempool.rs similarity index 100% rename from crates/client/rpc/src/providers/mempool.rs rename to crates/madara/client/rpc/src/providers/mempool.rs diff --git a/crates/client/rpc/src/providers/mod.rs b/crates/madara/client/rpc/src/providers/mod.rs similarity index 100% rename from crates/client/rpc/src/providers/mod.rs rename to crates/madara/client/rpc/src/providers/mod.rs diff --git a/crates/client/rpc/src/test_utils.rs b/crates/madara/client/rpc/src/test_utils.rs similarity index 100% rename from crates/client/rpc/src/test_utils.rs rename to crates/madara/client/rpc/src/test_utils.rs diff --git a/crates/client/rpc/src/types.rs b/crates/madara/client/rpc/src/types.rs similarity index 100% rename from crates/client/rpc/src/types.rs rename to crates/madara/client/rpc/src/types.rs diff --git a/crates/client/rpc/src/utils/mod.rs b/crates/madara/client/rpc/src/utils/mod.rs similarity index 100% rename from crates/client/rpc/src/utils/mod.rs rename to crates/madara/client/rpc/src/utils/mod.rs diff --git a/crates/client/rpc/src/versions/admin/mod.rs b/crates/madara/client/rpc/src/versions/admin/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/mod.rs rename to crates/madara/client/rpc/src/versions/admin/mod.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/api.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/api.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/api.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/api.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/methods/mod.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/methods/mod.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/mod.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/methods/services.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/services.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/methods/services.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/services.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/methods/status.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/status.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/methods/status.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/status.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/methods/write.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/write.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/methods/write.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/methods/write.rs diff --git a/crates/client/rpc/src/versions/admin/v0_1_0/mod.rs b/crates/madara/client/rpc/src/versions/admin/v0_1_0/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/admin/v0_1_0/mod.rs rename to crates/madara/client/rpc/src/versions/admin/v0_1_0/mod.rs diff --git a/crates/client/rpc/src/versions/mod.rs b/crates/madara/client/rpc/src/versions/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/mod.rs rename to crates/madara/client/rpc/src/versions/mod.rs diff --git a/crates/client/rpc/src/versions/user/mod.rs b/crates/madara/client/rpc/src/versions/user/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/mod.rs rename to crates/madara/client/rpc/src/versions/user/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/api.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/api.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/api.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/api.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/block_hash_and_number.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/block_hash_and_number.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/block_hash_and_number.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/block_hash_and_number.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/call.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/call.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/call.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/call.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_fee.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_fee.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_fee.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_fee.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_message_fee.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_message_fee.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_message_fee.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/estimate_message_fee.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_transaction_count.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_transaction_count.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_transaction_count.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_transaction_count.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_receipts.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_receipts.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_receipts.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_receipts.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_tx_hashes.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_tx_hashes.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_tx_hashes.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_tx_hashes.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_txs.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_txs.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_txs.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_block_with_txs.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_at.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_at.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_at.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_at.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_hash_at.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_hash_at.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_hash_at.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_class_hash_at.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_events.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_events.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_events.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_events.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_nonce.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_nonce.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_nonce.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_nonce.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_state_update.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_state_update.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_state_update.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_state_update.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_storage_at.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_storage_at.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_storage_at.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_storage_at.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_block_id_and_index.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_block_id_and_index.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_block_id_and_index.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_block_id_and_index.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_hash.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_hash.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_hash.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_by_hash.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_receipt.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_receipt.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_receipt.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_receipt.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_status.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_status.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_status.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/get_transaction_status.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/lib.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/lib.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/lib.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/lib.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/read/syncing.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/syncing.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/read/syncing.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/read/syncing.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/trace/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/trace/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/trace/simulate_transactions.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/simulate_transactions.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/trace/simulate_transactions.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/simulate_transactions.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_block_transactions.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_block_transactions.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_block_transactions.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_block_transactions.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_transaction.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_transaction.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_transaction.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/trace/trace_transaction.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/methods/write/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/methods/write/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/methods/write/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/methods/write/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_7_1/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_7_1/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_7_1/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_7_1/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/api.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/api.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/api.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/api.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/read/get_compiled_casm.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/get_compiled_casm.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/read/get_compiled_casm.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/get_compiled_casm.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/read/get_storage_proof.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/get_storage_proof.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/read/get_storage_proof.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/get_storage_proof.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/read/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/read/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/read/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/ws/lib.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/ws/lib.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/ws/lib.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/ws/lib.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/methods/ws/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/methods/ws/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/methods/ws/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/methods/ws/mod.rs diff --git a/crates/client/rpc/src/versions/user/v0_8_0/mod.rs b/crates/madara/client/rpc/src/versions/user/v0_8_0/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/user/v0_8_0/mod.rs rename to crates/madara/client/rpc/src/versions/user/v0_8_0/mod.rs diff --git a/crates/client/rpc/src/versions/v0_8_0/api.rs b/crates/madara/client/rpc/src/versions/v0_8_0/api.rs similarity index 100% rename from crates/client/rpc/src/versions/v0_8_0/api.rs rename to crates/madara/client/rpc/src/versions/v0_8_0/api.rs diff --git a/crates/client/rpc/src/versions/v0_8_0/methods/mod.rs b/crates/madara/client/rpc/src/versions/v0_8_0/methods/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/v0_8_0/methods/mod.rs rename to crates/madara/client/rpc/src/versions/v0_8_0/methods/mod.rs diff --git a/crates/client/rpc/src/versions/v0_8_0/methods/read/mod.rs b/crates/madara/client/rpc/src/versions/v0_8_0/methods/read/mod.rs similarity index 100% rename from crates/client/rpc/src/versions/v0_8_0/methods/read/mod.rs rename to crates/madara/client/rpc/src/versions/v0_8_0/methods/read/mod.rs diff --git a/crates/client/sync/Cargo.toml b/crates/madara/client/sync/Cargo.toml similarity index 100% rename from crates/client/sync/Cargo.toml rename to crates/madara/client/sync/Cargo.toml diff --git a/crates/client/sync/src/fetch/fetchers.rs b/crates/madara/client/sync/src/fetch/fetchers.rs similarity index 100% rename from crates/client/sync/src/fetch/fetchers.rs rename to crates/madara/client/sync/src/fetch/fetchers.rs diff --git a/crates/client/sync/src/fetch/fetchers_real_fgw_test.rs b/crates/madara/client/sync/src/fetch/fetchers_real_fgw_test.rs similarity index 100% rename from crates/client/sync/src/fetch/fetchers_real_fgw_test.rs rename to crates/madara/client/sync/src/fetch/fetchers_real_fgw_test.rs diff --git a/crates/client/sync/src/fetch/mod.rs b/crates/madara/client/sync/src/fetch/mod.rs similarity index 100% rename from crates/client/sync/src/fetch/mod.rs rename to crates/madara/client/sync/src/fetch/mod.rs diff --git a/crates/client/sync/src/l2.rs b/crates/madara/client/sync/src/l2.rs similarity index 100% rename from crates/client/sync/src/l2.rs rename to crates/madara/client/sync/src/l2.rs diff --git a/crates/client/sync/src/lib.rs b/crates/madara/client/sync/src/lib.rs similarity index 100% rename from crates/client/sync/src/lib.rs rename to crates/madara/client/sync/src/lib.rs diff --git a/crates/client/sync/src/metrics/block_metrics.rs b/crates/madara/client/sync/src/metrics/block_metrics.rs similarity index 100% rename from crates/client/sync/src/metrics/block_metrics.rs rename to crates/madara/client/sync/src/metrics/block_metrics.rs diff --git a/crates/client/sync/src/metrics/mod.rs b/crates/madara/client/sync/src/metrics/mod.rs similarity index 100% rename from crates/client/sync/src/metrics/mod.rs rename to crates/madara/client/sync/src/metrics/mod.rs diff --git a/crates/client/sync/src/tests/mod.rs b/crates/madara/client/sync/src/tests/mod.rs similarity index 100% rename from crates/client/sync/src/tests/mod.rs rename to crates/madara/client/sync/src/tests/mod.rs diff --git a/crates/client/sync/src/tests/utils/gateway.rs b/crates/madara/client/sync/src/tests/utils/gateway.rs similarity index 100% rename from crates/client/sync/src/tests/utils/gateway.rs rename to crates/madara/client/sync/src/tests/utils/gateway.rs diff --git a/crates/client/sync/src/tests/utils/mod.rs b/crates/madara/client/sync/src/tests/utils/mod.rs similarity index 100% rename from crates/client/sync/src/tests/utils/mod.rs rename to crates/madara/client/sync/src/tests/utils/mod.rs diff --git a/crates/client/sync/src/tests/utils/read_resource.rs b/crates/madara/client/sync/src/tests/utils/read_resource.rs similarity index 100% rename from crates/client/sync/src/tests/utils/read_resource.rs rename to crates/madara/client/sync/src/tests/utils/read_resource.rs diff --git a/crates/client/sync/src/tests/utils/retry.rs b/crates/madara/client/sync/src/tests/utils/retry.rs similarity index 100% rename from crates/client/sync/src/tests/utils/retry.rs rename to crates/madara/client/sync/src/tests/utils/retry.rs diff --git a/crates/client/sync/test-data/block_0.json b/crates/madara/client/sync/test-data/block_0.json similarity index 100% rename from crates/client/sync/test-data/block_0.json rename to crates/madara/client/sync/test-data/block_0.json diff --git a/crates/client/sync/test-data/block_724130.json b/crates/madara/client/sync/test-data/block_724130.json similarity index 100% rename from crates/client/sync/test-data/block_724130.json rename to crates/madara/client/sync/test-data/block_724130.json diff --git a/crates/client/telemetry/Cargo.toml b/crates/madara/client/telemetry/Cargo.toml similarity index 100% rename from crates/client/telemetry/Cargo.toml rename to crates/madara/client/telemetry/Cargo.toml diff --git a/crates/client/telemetry/build.rs b/crates/madara/client/telemetry/build.rs similarity index 100% rename from crates/client/telemetry/build.rs rename to crates/madara/client/telemetry/build.rs diff --git a/crates/client/telemetry/src/lib.rs b/crates/madara/client/telemetry/src/lib.rs similarity index 100% rename from crates/client/telemetry/src/lib.rs rename to crates/madara/client/telemetry/src/lib.rs diff --git a/crates/client/telemetry/src/sysinfo.rs b/crates/madara/client/telemetry/src/sysinfo.rs similarity index 100% rename from crates/client/telemetry/src/sysinfo.rs rename to crates/madara/client/telemetry/src/sysinfo.rs diff --git a/crates/node/Cargo.toml b/crates/madara/node/Cargo.toml similarity index 100% rename from crates/node/Cargo.toml rename to crates/madara/node/Cargo.toml diff --git a/crates/node/build.rs b/crates/madara/node/build.rs similarity index 100% rename from crates/node/build.rs rename to crates/madara/node/build.rs diff --git a/crates/node/src/cli/analytics.rs b/crates/madara/node/src/cli/analytics.rs similarity index 100% rename from crates/node/src/cli/analytics.rs rename to crates/madara/node/src/cli/analytics.rs diff --git a/crates/node/src/cli/block_production.rs b/crates/madara/node/src/cli/block_production.rs similarity index 100% rename from crates/node/src/cli/block_production.rs rename to crates/madara/node/src/cli/block_production.rs diff --git a/crates/node/src/cli/chain_config_overrides.rs b/crates/madara/node/src/cli/chain_config_overrides.rs similarity index 100% rename from crates/node/src/cli/chain_config_overrides.rs rename to crates/madara/node/src/cli/chain_config_overrides.rs diff --git a/crates/node/src/cli/db.rs b/crates/madara/node/src/cli/db.rs similarity index 100% rename from crates/node/src/cli/db.rs rename to crates/madara/node/src/cli/db.rs diff --git a/crates/node/src/cli/gateway.rs b/crates/madara/node/src/cli/gateway.rs similarity index 100% rename from crates/node/src/cli/gateway.rs rename to crates/madara/node/src/cli/gateway.rs diff --git a/crates/node/src/cli/l1.rs b/crates/madara/node/src/cli/l1.rs similarity index 100% rename from crates/node/src/cli/l1.rs rename to crates/madara/node/src/cli/l1.rs diff --git a/crates/node/src/cli/l2.rs b/crates/madara/node/src/cli/l2.rs similarity index 100% rename from crates/node/src/cli/l2.rs rename to crates/madara/node/src/cli/l2.rs diff --git a/crates/node/src/cli/mod.rs b/crates/madara/node/src/cli/mod.rs similarity index 100% rename from crates/node/src/cli/mod.rs rename to crates/madara/node/src/cli/mod.rs diff --git a/crates/node/src/cli/rpc.rs b/crates/madara/node/src/cli/rpc.rs similarity index 100% rename from crates/node/src/cli/rpc.rs rename to crates/madara/node/src/cli/rpc.rs diff --git a/crates/node/src/cli/telemetry.rs b/crates/madara/node/src/cli/telemetry.rs similarity index 100% rename from crates/node/src/cli/telemetry.rs rename to crates/madara/node/src/cli/telemetry.rs diff --git a/crates/node/src/main.rs b/crates/madara/node/src/main.rs similarity index 100% rename from crates/node/src/main.rs rename to crates/madara/node/src/main.rs diff --git a/crates/node/src/service/block_production.rs b/crates/madara/node/src/service/block_production.rs similarity index 100% rename from crates/node/src/service/block_production.rs rename to crates/madara/node/src/service/block_production.rs diff --git a/crates/node/src/service/database.rs b/crates/madara/node/src/service/database.rs similarity index 100% rename from crates/node/src/service/database.rs rename to crates/madara/node/src/service/database.rs diff --git a/crates/node/src/service/gateway.rs b/crates/madara/node/src/service/gateway.rs similarity index 100% rename from crates/node/src/service/gateway.rs rename to crates/madara/node/src/service/gateway.rs diff --git a/crates/node/src/service/l1.rs b/crates/madara/node/src/service/l1.rs similarity index 100% rename from crates/node/src/service/l1.rs rename to crates/madara/node/src/service/l1.rs diff --git a/crates/node/src/service/l2.rs b/crates/madara/node/src/service/l2.rs similarity index 100% rename from crates/node/src/service/l2.rs rename to crates/madara/node/src/service/l2.rs diff --git a/crates/node/src/service/mod.rs b/crates/madara/node/src/service/mod.rs similarity index 100% rename from crates/node/src/service/mod.rs rename to crates/madara/node/src/service/mod.rs diff --git a/crates/node/src/service/rpc/metrics.rs b/crates/madara/node/src/service/rpc/metrics.rs similarity index 100% rename from crates/node/src/service/rpc/metrics.rs rename to crates/madara/node/src/service/rpc/metrics.rs diff --git a/crates/node/src/service/rpc/middleware.rs b/crates/madara/node/src/service/rpc/middleware.rs similarity index 100% rename from crates/node/src/service/rpc/middleware.rs rename to crates/madara/node/src/service/rpc/middleware.rs diff --git a/crates/node/src/service/rpc/mod.rs b/crates/madara/node/src/service/rpc/mod.rs similarity index 100% rename from crates/node/src/service/rpc/mod.rs rename to crates/madara/node/src/service/rpc/mod.rs diff --git a/crates/node/src/service/rpc/server.rs b/crates/madara/node/src/service/rpc/server.rs similarity index 100% rename from crates/node/src/service/rpc/server.rs rename to crates/madara/node/src/service/rpc/server.rs diff --git a/crates/node/src/util.rs b/crates/madara/node/src/util.rs similarity index 100% rename from crates/node/src/util.rs rename to crates/madara/node/src/util.rs diff --git a/crates/primitives/block/Cargo.toml b/crates/madara/primitives/block/Cargo.toml similarity index 100% rename from crates/primitives/block/Cargo.toml rename to crates/madara/primitives/block/Cargo.toml diff --git a/crates/primitives/block/src/header.rs b/crates/madara/primitives/block/src/header.rs similarity index 100% rename from crates/primitives/block/src/header.rs rename to crates/madara/primitives/block/src/header.rs diff --git a/crates/primitives/block/src/lib.rs b/crates/madara/primitives/block/src/lib.rs similarity index 100% rename from crates/primitives/block/src/lib.rs rename to crates/madara/primitives/block/src/lib.rs diff --git a/crates/primitives/chain_config/Cargo.toml b/crates/madara/primitives/chain_config/Cargo.toml similarity index 100% rename from crates/primitives/chain_config/Cargo.toml rename to crates/madara/primitives/chain_config/Cargo.toml diff --git a/crates/primitives/chain_config/resources/versioned_constants_13_0.json b/crates/madara/primitives/chain_config/resources/versioned_constants_13_0.json similarity index 100% rename from crates/primitives/chain_config/resources/versioned_constants_13_0.json rename to crates/madara/primitives/chain_config/resources/versioned_constants_13_0.json diff --git a/crates/primitives/chain_config/resources/versioned_constants_13_1.json b/crates/madara/primitives/chain_config/resources/versioned_constants_13_1.json similarity index 100% rename from crates/primitives/chain_config/resources/versioned_constants_13_1.json rename to crates/madara/primitives/chain_config/resources/versioned_constants_13_1.json diff --git a/crates/primitives/chain_config/resources/versioned_constants_13_1_1.json b/crates/madara/primitives/chain_config/resources/versioned_constants_13_1_1.json similarity index 100% rename from crates/primitives/chain_config/resources/versioned_constants_13_1_1.json rename to crates/madara/primitives/chain_config/resources/versioned_constants_13_1_1.json diff --git a/crates/primitives/chain_config/resources/versioned_constants_13_2.json b/crates/madara/primitives/chain_config/resources/versioned_constants_13_2.json similarity index 100% rename from crates/primitives/chain_config/resources/versioned_constants_13_2.json rename to crates/madara/primitives/chain_config/resources/versioned_constants_13_2.json diff --git a/crates/primitives/chain_config/src/chain_config.rs b/crates/madara/primitives/chain_config/src/chain_config.rs similarity index 98% rename from crates/primitives/chain_config/src/chain_config.rs rename to crates/madara/primitives/chain_config/src/chain_config.rs index 409ff9bb5..4d37e1d3d 100644 --- a/crates/primitives/chain_config/src/chain_config.rs +++ b/crates/madara/primitives/chain_config/src/chain_config.rs @@ -464,7 +464,7 @@ mod tests { #[rstest] fn test_mainnet_from_yaml() { // Change the current directory - std::env::set_current_dir("../../../").expect("Failed to change directory"); + std::env::set_current_dir("../../../../").expect("Failed to change directory"); let chain_config: ChainConfig = ChainConfig::from_yaml(Path::new("configs/presets/mainnet.yaml")).expect("failed to get cfg"); @@ -480,8 +480,9 @@ mod tests { // Check versioned constants // Load and parse the JSON file - let json_content = fs::read_to_string("crates/primitives/chain_config/resources/versioned_constants_13_0.json") - .expect("Failed to read JSON file"); + let json_content = + fs::read_to_string("crates/madara/primitives/chain_config/resources/versioned_constants_13_0.json") + .expect("Failed to read JSON file"); let json: Value = serde_json::from_str(&json_content).expect("Failed to parse JSON"); // Get the VersionedConstants for version 0.13.0 diff --git a/crates/primitives/chain_config/src/lib.rs b/crates/madara/primitives/chain_config/src/lib.rs similarity index 100% rename from crates/primitives/chain_config/src/lib.rs rename to crates/madara/primitives/chain_config/src/lib.rs diff --git a/crates/primitives/chain_config/src/rpc_version.rs b/crates/madara/primitives/chain_config/src/rpc_version.rs similarity index 100% rename from crates/primitives/chain_config/src/rpc_version.rs rename to crates/madara/primitives/chain_config/src/rpc_version.rs diff --git a/crates/primitives/chain_config/src/starknet_version.rs b/crates/madara/primitives/chain_config/src/starknet_version.rs similarity index 100% rename from crates/primitives/chain_config/src/starknet_version.rs rename to crates/madara/primitives/chain_config/src/starknet_version.rs diff --git a/crates/primitives/class/Cargo.toml b/crates/madara/primitives/class/Cargo.toml similarity index 100% rename from crates/primitives/class/Cargo.toml rename to crates/madara/primitives/class/Cargo.toml diff --git a/crates/primitives/class/resources/missed_classes.json b/crates/madara/primitives/class/resources/missed_classes.json similarity index 100% rename from crates/primitives/class/resources/missed_classes.json rename to crates/madara/primitives/class/resources/missed_classes.json diff --git a/crates/primitives/class/src/class_hash.rs b/crates/madara/primitives/class/src/class_hash.rs similarity index 100% rename from crates/primitives/class/src/class_hash.rs rename to crates/madara/primitives/class/src/class_hash.rs diff --git a/crates/primitives/class/src/class_update.rs b/crates/madara/primitives/class/src/class_update.rs similarity index 100% rename from crates/primitives/class/src/class_update.rs rename to crates/madara/primitives/class/src/class_update.rs diff --git a/crates/primitives/class/src/compile.rs b/crates/madara/primitives/class/src/compile.rs similarity index 100% rename from crates/primitives/class/src/compile.rs rename to crates/madara/primitives/class/src/compile.rs diff --git a/crates/primitives/class/src/convert.rs b/crates/madara/primitives/class/src/convert.rs similarity index 100% rename from crates/primitives/class/src/convert.rs rename to crates/madara/primitives/class/src/convert.rs diff --git a/crates/primitives/class/src/into_starknet_core.rs b/crates/madara/primitives/class/src/into_starknet_core.rs similarity index 100% rename from crates/primitives/class/src/into_starknet_core.rs rename to crates/madara/primitives/class/src/into_starknet_core.rs diff --git a/crates/primitives/class/src/into_starknet_types.rs b/crates/madara/primitives/class/src/into_starknet_types.rs similarity index 100% rename from crates/primitives/class/src/into_starknet_types.rs rename to crates/madara/primitives/class/src/into_starknet_types.rs diff --git a/crates/primitives/class/src/lib.rs b/crates/madara/primitives/class/src/lib.rs similarity index 100% rename from crates/primitives/class/src/lib.rs rename to crates/madara/primitives/class/src/lib.rs diff --git a/crates/primitives/convert/Cargo.toml b/crates/madara/primitives/convert/Cargo.toml similarity index 100% rename from crates/primitives/convert/Cargo.toml rename to crates/madara/primitives/convert/Cargo.toml diff --git a/crates/primitives/convert/src/felt.rs b/crates/madara/primitives/convert/src/felt.rs similarity index 100% rename from crates/primitives/convert/src/felt.rs rename to crates/madara/primitives/convert/src/felt.rs diff --git a/crates/primitives/convert/src/hex_serde.rs b/crates/madara/primitives/convert/src/hex_serde.rs similarity index 100% rename from crates/primitives/convert/src/hex_serde.rs rename to crates/madara/primitives/convert/src/hex_serde.rs diff --git a/crates/primitives/convert/src/lib.rs b/crates/madara/primitives/convert/src/lib.rs similarity index 100% rename from crates/primitives/convert/src/lib.rs rename to crates/madara/primitives/convert/src/lib.rs diff --git a/crates/primitives/convert/src/to_felt.rs b/crates/madara/primitives/convert/src/to_felt.rs similarity index 100% rename from crates/primitives/convert/src/to_felt.rs rename to crates/madara/primitives/convert/src/to_felt.rs diff --git a/crates/primitives/gateway/Cargo.toml b/crates/madara/primitives/gateway/Cargo.toml similarity index 100% rename from crates/primitives/gateway/Cargo.toml rename to crates/madara/primitives/gateway/Cargo.toml diff --git a/crates/primitives/gateway/src/block.rs b/crates/madara/primitives/gateway/src/block.rs similarity index 100% rename from crates/primitives/gateway/src/block.rs rename to crates/madara/primitives/gateway/src/block.rs diff --git a/crates/primitives/gateway/src/error.rs b/crates/madara/primitives/gateway/src/error.rs similarity index 100% rename from crates/primitives/gateway/src/error.rs rename to crates/madara/primitives/gateway/src/error.rs diff --git a/crates/primitives/gateway/src/lib.rs b/crates/madara/primitives/gateway/src/lib.rs similarity index 100% rename from crates/primitives/gateway/src/lib.rs rename to crates/madara/primitives/gateway/src/lib.rs diff --git a/crates/primitives/gateway/src/receipt.rs b/crates/madara/primitives/gateway/src/receipt.rs similarity index 100% rename from crates/primitives/gateway/src/receipt.rs rename to crates/madara/primitives/gateway/src/receipt.rs diff --git a/crates/primitives/gateway/src/state_update.rs b/crates/madara/primitives/gateway/src/state_update.rs similarity index 100% rename from crates/primitives/gateway/src/state_update.rs rename to crates/madara/primitives/gateway/src/state_update.rs diff --git a/crates/primitives/gateway/src/test.rs b/crates/madara/primitives/gateway/src/test.rs similarity index 100% rename from crates/primitives/gateway/src/test.rs rename to crates/madara/primitives/gateway/src/test.rs diff --git a/crates/primitives/gateway/src/transaction.rs b/crates/madara/primitives/gateway/src/transaction.rs similarity index 100% rename from crates/primitives/gateway/src/transaction.rs rename to crates/madara/primitives/gateway/src/transaction.rs diff --git a/crates/primitives/gateway/src/user_transaction.rs b/crates/madara/primitives/gateway/src/user_transaction.rs similarity index 100% rename from crates/primitives/gateway/src/user_transaction.rs rename to crates/madara/primitives/gateway/src/user_transaction.rs diff --git a/crates/primitives/oracle/Cargo.toml b/crates/madara/primitives/oracle/Cargo.toml similarity index 100% rename from crates/primitives/oracle/Cargo.toml rename to crates/madara/primitives/oracle/Cargo.toml diff --git a/crates/primitives/oracle/src/lib.rs b/crates/madara/primitives/oracle/src/lib.rs similarity index 100% rename from crates/primitives/oracle/src/lib.rs rename to crates/madara/primitives/oracle/src/lib.rs diff --git a/crates/primitives/oracle/src/pragma.rs b/crates/madara/primitives/oracle/src/pragma.rs similarity index 100% rename from crates/primitives/oracle/src/pragma.rs rename to crates/madara/primitives/oracle/src/pragma.rs diff --git a/crates/primitives/receipt/Cargo.toml b/crates/madara/primitives/receipt/Cargo.toml similarity index 100% rename from crates/primitives/receipt/Cargo.toml rename to crates/madara/primitives/receipt/Cargo.toml diff --git a/crates/primitives/receipt/src/from_blockifier.rs b/crates/madara/primitives/receipt/src/from_blockifier.rs similarity index 100% rename from crates/primitives/receipt/src/from_blockifier.rs rename to crates/madara/primitives/receipt/src/from_blockifier.rs diff --git a/crates/primitives/receipt/src/lib.rs b/crates/madara/primitives/receipt/src/lib.rs similarity index 100% rename from crates/primitives/receipt/src/lib.rs rename to crates/madara/primitives/receipt/src/lib.rs diff --git a/crates/primitives/receipt/src/to_starknet_types.rs b/crates/madara/primitives/receipt/src/to_starknet_types.rs similarity index 100% rename from crates/primitives/receipt/src/to_starknet_types.rs rename to crates/madara/primitives/receipt/src/to_starknet_types.rs diff --git a/crates/primitives/state_update/Cargo.toml b/crates/madara/primitives/state_update/Cargo.toml similarity index 100% rename from crates/primitives/state_update/Cargo.toml rename to crates/madara/primitives/state_update/Cargo.toml diff --git a/crates/primitives/state_update/src/into_starknet_types.rs b/crates/madara/primitives/state_update/src/into_starknet_types.rs similarity index 100% rename from crates/primitives/state_update/src/into_starknet_types.rs rename to crates/madara/primitives/state_update/src/into_starknet_types.rs diff --git a/crates/primitives/state_update/src/lib.rs b/crates/madara/primitives/state_update/src/lib.rs similarity index 100% rename from crates/primitives/state_update/src/lib.rs rename to crates/madara/primitives/state_update/src/lib.rs diff --git a/crates/primitives/transactions/Cargo.toml b/crates/madara/primitives/transactions/Cargo.toml similarity index 100% rename from crates/primitives/transactions/Cargo.toml rename to crates/madara/primitives/transactions/Cargo.toml diff --git a/crates/primitives/transactions/src/compute_hash.rs b/crates/madara/primitives/transactions/src/compute_hash.rs similarity index 100% rename from crates/primitives/transactions/src/compute_hash.rs rename to crates/madara/primitives/transactions/src/compute_hash.rs diff --git a/crates/primitives/transactions/src/from_blockifier.rs b/crates/madara/primitives/transactions/src/from_blockifier.rs similarity index 100% rename from crates/primitives/transactions/src/from_blockifier.rs rename to crates/madara/primitives/transactions/src/from_blockifier.rs diff --git a/crates/primitives/transactions/src/from_broadcasted_transaction.rs b/crates/madara/primitives/transactions/src/from_broadcasted_transaction.rs similarity index 100% rename from crates/primitives/transactions/src/from_broadcasted_transaction.rs rename to crates/madara/primitives/transactions/src/from_broadcasted_transaction.rs diff --git a/crates/primitives/transactions/src/from_starknet_types.rs b/crates/madara/primitives/transactions/src/from_starknet_types.rs similarity index 100% rename from crates/primitives/transactions/src/from_starknet_types.rs rename to crates/madara/primitives/transactions/src/from_starknet_types.rs diff --git a/crates/primitives/transactions/src/into_starknet_api.rs b/crates/madara/primitives/transactions/src/into_starknet_api.rs similarity index 100% rename from crates/primitives/transactions/src/into_starknet_api.rs rename to crates/madara/primitives/transactions/src/into_starknet_api.rs diff --git a/crates/primitives/transactions/src/lib.rs b/crates/madara/primitives/transactions/src/lib.rs similarity index 100% rename from crates/primitives/transactions/src/lib.rs rename to crates/madara/primitives/transactions/src/lib.rs diff --git a/crates/primitives/transactions/src/to_blockifier.rs b/crates/madara/primitives/transactions/src/to_blockifier.rs similarity index 100% rename from crates/primitives/transactions/src/to_blockifier.rs rename to crates/madara/primitives/transactions/src/to_blockifier.rs diff --git a/crates/primitives/transactions/src/to_starknet_types.rs b/crates/madara/primitives/transactions/src/to_starknet_types.rs similarity index 100% rename from crates/primitives/transactions/src/to_starknet_types.rs rename to crates/madara/primitives/transactions/src/to_starknet_types.rs diff --git a/crates/primitives/transactions/src/utils.rs b/crates/madara/primitives/transactions/src/utils.rs similarity index 100% rename from crates/primitives/transactions/src/utils.rs rename to crates/madara/primitives/transactions/src/utils.rs diff --git a/crates/primitives/utils/Cargo.toml b/crates/madara/primitives/utils/Cargo.toml similarity index 100% rename from crates/primitives/utils/Cargo.toml rename to crates/madara/primitives/utils/Cargo.toml diff --git a/crates/primitives/utils/src/crypto.rs b/crates/madara/primitives/utils/src/crypto.rs similarity index 100% rename from crates/primitives/utils/src/crypto.rs rename to crates/madara/primitives/utils/src/crypto.rs diff --git a/crates/primitives/utils/src/hash.rs b/crates/madara/primitives/utils/src/hash.rs similarity index 100% rename from crates/primitives/utils/src/hash.rs rename to crates/madara/primitives/utils/src/hash.rs diff --git a/crates/primitives/utils/src/lib.rs b/crates/madara/primitives/utils/src/lib.rs similarity index 100% rename from crates/primitives/utils/src/lib.rs rename to crates/madara/primitives/utils/src/lib.rs diff --git a/crates/primitives/utils/src/parsers.rs b/crates/madara/primitives/utils/src/parsers.rs similarity index 100% rename from crates/primitives/utils/src/parsers.rs rename to crates/madara/primitives/utils/src/parsers.rs diff --git a/crates/primitives/utils/src/serde.rs b/crates/madara/primitives/utils/src/serde.rs similarity index 100% rename from crates/primitives/utils/src/serde.rs rename to crates/madara/primitives/utils/src/serde.rs diff --git a/crates/primitives/utils/src/service.rs b/crates/madara/primitives/utils/src/service.rs similarity index 100% rename from crates/primitives/utils/src/service.rs rename to crates/madara/primitives/utils/src/service.rs diff --git a/crates/proc-macros/Cargo.toml b/crates/madara/proc-macros/Cargo.toml similarity index 100% rename from crates/proc-macros/Cargo.toml rename to crates/madara/proc-macros/Cargo.toml diff --git a/crates/proc-macros/src/lib.rs b/crates/madara/proc-macros/src/lib.rs similarity index 100% rename from crates/proc-macros/src/lib.rs rename to crates/madara/proc-macros/src/lib.rs diff --git a/crates/tests/Cargo.toml b/crates/madara/tests/Cargo.toml similarity index 100% rename from crates/tests/Cargo.toml rename to crates/madara/tests/Cargo.toml diff --git a/crates/tests/src/devnet.rs b/crates/madara/tests/src/devnet.rs similarity index 100% rename from crates/tests/src/devnet.rs rename to crates/madara/tests/src/devnet.rs diff --git a/crates/tests/src/lib.rs b/crates/madara/tests/src/lib.rs similarity index 100% rename from crates/tests/src/lib.rs rename to crates/madara/tests/src/lib.rs diff --git a/crates/tests/src/rpc/mod.rs b/crates/madara/tests/src/rpc/mod.rs similarity index 100% rename from crates/tests/src/rpc/mod.rs rename to crates/madara/tests/src/rpc/mod.rs diff --git a/crates/tests/src/rpc/read.rs b/crates/madara/tests/src/rpc/read.rs similarity index 100% rename from crates/tests/src/rpc/read.rs rename to crates/madara/tests/src/rpc/read.rs diff --git a/crates/tests/src/rpc/test_utils/class_program.txt b/crates/madara/tests/src/rpc/test_utils/class_program.txt similarity index 100% rename from crates/tests/src/rpc/test_utils/class_program.txt rename to crates/madara/tests/src/rpc/test_utils/class_program.txt diff --git a/crates/tests/src/rpc/test_utils/compiled_class.json b/crates/madara/tests/src/rpc/test_utils/compiled_class.json similarity index 100% rename from crates/tests/src/rpc/test_utils/compiled_class.json rename to crates/madara/tests/src/rpc/test_utils/compiled_class.json diff --git a/crates/tests/src/rpc/test_utils/contract_class.json b/crates/madara/tests/src/rpc/test_utils/contract_class.json similarity index 100% rename from crates/tests/src/rpc/test_utils/contract_class.json rename to crates/madara/tests/src/rpc/test_utils/contract_class.json diff --git a/crates/tests/src/storage_proof.rs b/crates/madara/tests/src/storage_proof.rs similarity index 100% rename from crates/tests/src/storage_proof.rs rename to crates/madara/tests/src/storage_proof.rs diff --git a/crates/tests/test_devnet.yaml b/crates/madara/tests/test_devnet.yaml similarity index 100% rename from crates/tests/test_devnet.yaml rename to crates/madara/tests/test_devnet.yaml