From c4c355c589db47267c82a250af5ad4cfde7d0cf0 Mon Sep 17 00:00:00 2001 From: "Muhammad-Jibril B.A. (Khalifa MBA)" Date: Tue, 13 Feb 2024 19:12:01 +0000 Subject: [PATCH] Serparate `chains` (starting with qingdao) and move `primitives` into `blockchain` --- .../{bin => chains/qingdao}/node/Cargo.toml | 10 +++--- .../{bin => chains/qingdao}/node/build.rs | 0 .../qingdao}/node/src/chain_spec.rs | 4 +-- .../{bin => chains/qingdao}/node/src/cli.rs | 0 .../qingdao}/node/src/command.rs | 0 .../{bin => chains/qingdao}/node/src/lib.rs | 0 .../{bin => chains/qingdao}/node/src/main.rs | 0 .../{bin => chains/qingdao}/node/src/rpc.rs | 0 .../qingdao}/node/src/service.rs | 0 .../{bin => chains/qingdao}/rpc/Pipfile | 0 .../{bin => chains/qingdao}/rpc/Pipfile.lock | 0 .../{bin => chains/qingdao}/rpc/README.md | 0 .../{bin => chains/qingdao}/rpc/nginx.conf | 0 blockchain/{bin => chains/qingdao}/rpc/rpc.py | 2 +- .../qingdao}/runtime/Cargo.toml | 32 +++++++++---------- .../{bin => chains/qingdao}/runtime/build.rs | 0 .../qingdao}/runtime/common/Cargo.toml | 24 +++++++------- .../runtime/common/src/gas_to_weight_ratio.rs | 0 .../qingdao}/runtime/common/src/lib.rs | 0 .../runtime/common/src/precompile/dex.rs | 0 .../runtime/common/src/precompile/input.rs | 0 .../runtime/common/src/precompile/mock.rs | 0 .../runtime/common/src/precompile/mod.rs | 0 .../common/src/precompile/multicurrency.rs | 0 .../runtime/common/src/precompile/nft.rs | 0 .../runtime/common/src/precompile/oracle.rs | 0 .../common/src/precompile/schedule_call.rs | 0 .../common/src/precompile/state_rent.rs | 0 .../runtime/common/src/precompile/tests.rs | 0 .../runtime/common/src/weights/lib.rs | 0 .../qingdao}/runtime/src/authority.rs | 0 .../runtime/src/benchmarking/auction.rs | 0 .../src/benchmarking/auction_manager.rs | 0 .../runtime/src/benchmarking/authority.rs | 0 .../runtime/src/benchmarking/cdp_engine.rs | 0 .../runtime/src/benchmarking/cdp_treasury.rs | 0 .../runtime/src/benchmarking/currencies.rs | 0 .../qingdao}/runtime/src/benchmarking/dex.rs | 0 .../runtime/src/benchmarking/dex_oracle.rs | 0 .../src/benchmarking/emergency_shutdown.rs | 0 .../qingdao}/runtime/src/benchmarking/evm.rs | 0 .../runtime/src/benchmarking/evm_accounts.rs | 0 .../qingdao}/runtime/src/benchmarking/mod.rs | 0 .../runtime/src/benchmarking/oracle.rs | 0 .../runtime/src/benchmarking/prices.rs | 0 .../runtime/src/benchmarking/serp_setmint.rs | 0 .../runtime/src/benchmarking/serp_treasury.rs | 0 .../runtime/src/benchmarking/tokens.rs | 0 .../src/benchmarking/transaction_pause.rs | 0 .../src/benchmarking/transaction_payment.rs | 0 .../runtime/src/benchmarking/utils.rs | 0 .../runtime/src/benchmarking/vesting.rs | 0 .../qingdao}/runtime/src/constants.rs | 0 .../qingdao}/runtime/src/lib.rs | 0 .../runtime/src/weights/dex_oracle.rs | 0 .../runtime/src/weights/emergency_shutdown.rs | 0 .../qingdao}/runtime/src/weights/mod.rs | 0 .../src/weights/module_auction_manager.rs | 0 .../runtime/src/weights/module_cdp_engine.rs | 0 .../src/weights/module_cdp_treasury.rs | 0 .../runtime/src/weights/module_currencies.rs | 0 .../runtime/src/weights/module_dex.rs | 0 .../runtime/src/weights/module_evm.rs | 0 .../src/weights/module_evm_accounts.rs | 0 .../runtime/src/weights/module_nft.rs | 0 .../runtime/src/weights/module_prices.rs | 0 .../src/weights/module_transaction_pause.rs | 0 .../src/weights/module_transaction_payment.rs | 0 .../runtime/src/weights/module_vesting.rs | 0 .../runtime/src/weights/orml_auction.rs | 0 .../runtime/src/weights/orml_authority.rs | 0 .../runtime/src/weights/orml_oracle.rs | 0 .../runtime/src/weights/orml_tokens.rs | 0 .../runtime/src/weights/serp_setmint.rs | 0 .../runtime/src/weights/serp_treasury.rs | 0 .../runtime/tests/solidity_test/Address.json | 0 .../runtime/tests/solidity_test/Counters.json | 0 .../tests/solidity_test/TokenMock.json | 0 .../qingdao}/runtime/tests/weights_test.rs | 0 blockchain/modules/airdrop/Cargo.toml | 2 +- blockchain/modules/currencies/Cargo.toml | 2 +- blockchain/modules/currencies/src/weights.rs | 2 +- blockchain/modules/evm-accounts/Cargo.toml | 2 +- .../modules/evm-accounts/src/weights.rs | 2 +- blockchain/modules/evm-bridge/Cargo.toml | 4 +-- blockchain/modules/evm-manager/Cargo.toml | 2 +- blockchain/modules/evm/Cargo.toml | 2 +- .../modules/evm/rpc/runtime_api/Cargo.toml | 2 +- blockchain/modules/evm/src/weights.rs | 2 +- blockchain/modules/idle-scheduler/Cargo.toml | 2 +- .../modules/idle-scheduler/src/weights.rs | 2 +- blockchain/modules/nft/Cargo.toml | 2 +- blockchain/modules/nft/src/weights.rs | 2 +- blockchain/modules/prices/Cargo.toml | 2 +- blockchain/modules/prices/src/weights.rs | 2 +- blockchain/modules/support/Cargo.toml | 2 +- .../modules/transaction-pause/Cargo.toml | 2 +- .../modules/transaction-pause/src/weights.rs | 2 +- .../modules/transaction-payment/Cargo.toml | 2 +- .../transaction-payment/src/weights.rs | 2 +- blockchain/modules/vesting/Cargo.toml | 2 +- .../primitives}/Cargo.toml | 0 .../primitives}/proc-macro/Cargo.toml | 0 .../primitives}/proc-macro/src/lib.rs | 0 .../primitives}/src/currency.rs | 0 .../primitives}/src/evm.rs | 0 .../primitives}/src/lib.rs | 0 .../primitives}/src/signature.rs | 0 .../primitives}/src/task.rs | 0 .../primitives}/src/tests.rs | 0 .../resources/chain_spec_mainnet.json | 0 .../resources/chain_spec_mainnet_raw.json | 0 .../resources/chain_spec_testnet.json | 0 .../resources/chain_spec_testnet_raw.json | 0 blockchain/{bin => }/resources/types.json | 0 115 files changed, 59 insertions(+), 59 deletions(-) rename blockchain/{bin => chains/qingdao}/node/Cargo.toml (94%) rename blockchain/{bin => chains/qingdao}/node/build.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/chain_spec.rs (99%) rename blockchain/{bin => chains/qingdao}/node/src/cli.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/command.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/lib.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/main.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/rpc.rs (100%) rename blockchain/{bin => chains/qingdao}/node/src/service.rs (100%) rename blockchain/{bin => chains/qingdao}/rpc/Pipfile (100%) rename blockchain/{bin => chains/qingdao}/rpc/Pipfile.lock (100%) rename blockchain/{bin => chains/qingdao}/rpc/README.md (100%) rename blockchain/{bin => chains/qingdao}/rpc/nginx.conf (100%) rename blockchain/{bin => chains/qingdao}/rpc/rpc.py (97%) rename blockchain/{bin => chains/qingdao}/runtime/Cargo.toml (90%) rename blockchain/{bin => chains/qingdao}/runtime/build.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/Cargo.toml (76%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/gas_to_weight_ratio.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/lib.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/dex.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/input.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/mock.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/mod.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/multicurrency.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/nft.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/oracle.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/schedule_call.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/state_rent.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/precompile/tests.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/common/src/weights/lib.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/authority.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/auction.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/auction_manager.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/authority.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/cdp_engine.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/cdp_treasury.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/currencies.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/dex.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/dex_oracle.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/emergency_shutdown.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/evm.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/evm_accounts.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/mod.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/oracle.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/prices.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/serp_setmint.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/serp_treasury.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/tokens.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/transaction_pause.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/transaction_payment.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/utils.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/benchmarking/vesting.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/constants.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/lib.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/dex_oracle.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/emergency_shutdown.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/mod.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_auction_manager.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_cdp_engine.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_cdp_treasury.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_currencies.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_dex.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_evm.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_evm_accounts.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_nft.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_prices.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_transaction_pause.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_transaction_payment.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/module_vesting.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/orml_auction.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/orml_authority.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/orml_oracle.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/orml_tokens.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/serp_setmint.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/src/weights/serp_treasury.rs (100%) rename blockchain/{bin => chains/qingdao}/runtime/tests/solidity_test/Address.json (100%) rename blockchain/{bin => chains/qingdao}/runtime/tests/solidity_test/Counters.json (100%) rename blockchain/{bin => chains/qingdao}/runtime/tests/solidity_test/TokenMock.json (100%) rename blockchain/{bin => chains/qingdao}/runtime/tests/weights_test.rs (100%) rename {primitives => blockchain/primitives}/Cargo.toml (100%) rename {primitives => blockchain/primitives}/proc-macro/Cargo.toml (100%) rename {primitives => blockchain/primitives}/proc-macro/src/lib.rs (100%) rename {primitives => blockchain/primitives}/src/currency.rs (100%) rename {primitives => blockchain/primitives}/src/evm.rs (100%) rename {primitives => blockchain/primitives}/src/lib.rs (100%) rename {primitives => blockchain/primitives}/src/signature.rs (100%) rename {primitives => blockchain/primitives}/src/task.rs (100%) rename {primitives => blockchain/primitives}/src/tests.rs (100%) rename blockchain/{bin => }/resources/chain_spec_mainnet.json (100%) rename blockchain/{bin => }/resources/chain_spec_mainnet_raw.json (100%) rename blockchain/{bin => }/resources/chain_spec_testnet.json (100%) rename blockchain/{bin => }/resources/chain_spec_testnet_raw.json (100%) rename blockchain/{bin => }/resources/types.json (100%) diff --git a/blockchain/bin/node/Cargo.toml b/blockchain/chains/qingdao/node/Cargo.toml similarity index 94% rename from blockchain/bin/node/Cargo.toml rename to blockchain/chains/qingdao/node/Cargo.toml index e0b141209..ccc6709ec 100644 --- a/blockchain/bin/node/Cargo.toml +++ b/blockchain/chains/qingdao/node/Cargo.toml @@ -71,12 +71,12 @@ node-runtime = { git = "https://github.com/paritytech/substrate", branch = "polk orml-oracle-rpc = { path = "../../../submodules/orml/oracle/rpc" } -module-nft = { path = "../../modules/nft" } -module-evm = { path = "../../modules//evm" } -module-evm-rpc-runtime-api = { path = "../../modules//evm/rpc/runtime_api" } -evm-rpc = { path = "../../modules//evm/rpc" } +module-nft = { path = "../../../modules/nft" } +module-evm = { path = "../../../modules//evm" } +module-evm-rpc-runtime-api = { path = "../../../modules//evm/rpc/runtime_api" } +evm-rpc = { path = "../../../modules//evm/rpc" } -setheum-primitives = { path = "../../../primitives" } +setheum-primitives = { path = "../../primitives" } # runtime setheum-runtime = { path = '../runtime', version = '1.0.0' } diff --git a/blockchain/bin/node/build.rs b/blockchain/chains/qingdao/node/build.rs similarity index 100% rename from blockchain/bin/node/build.rs rename to blockchain/chains/qingdao/node/build.rs diff --git a/blockchain/bin/node/src/chain_spec.rs b/blockchain/chains/qingdao/node/src/chain_spec.rs similarity index 99% rename from blockchain/bin/node/src/chain_spec.rs rename to blockchain/chains/qingdao/node/src/chain_spec.rs index 21b883f6a..f610f6e15 100644 --- a/blockchain/bin/node/src/chain_spec.rs +++ b/blockchain/chains/qingdao/node/src/chain_spec.rs @@ -303,11 +303,11 @@ pub fn public_testnet_config() -> Result { pub fn live_mainnet_config() -> Result { - ChainSpec::from_json_bytes(&include_bytes!("../resources/chain_spec_mainnet_raw.json")[..]) + ChainSpec::from_json_bytes(&include_bytes!("../../resources/chain_spec_mainnet_raw.json")[..]) } pub fn live_testnet_config() -> Result { - ChainSpec::from_json_bytes(&include_bytes!("../resources/chain_spec_testnet_raw.json")[..]) + ChainSpec::from_json_bytes(&include_bytes!("../../resources/chain_spec_testnet_raw.json")[..]) } pub fn mainnet_config() -> Result { diff --git a/blockchain/bin/node/src/cli.rs b/blockchain/chains/qingdao/node/src/cli.rs similarity index 100% rename from blockchain/bin/node/src/cli.rs rename to blockchain/chains/qingdao/node/src/cli.rs diff --git a/blockchain/bin/node/src/command.rs b/blockchain/chains/qingdao/node/src/command.rs similarity index 100% rename from blockchain/bin/node/src/command.rs rename to blockchain/chains/qingdao/node/src/command.rs diff --git a/blockchain/bin/node/src/lib.rs b/blockchain/chains/qingdao/node/src/lib.rs similarity index 100% rename from blockchain/bin/node/src/lib.rs rename to blockchain/chains/qingdao/node/src/lib.rs diff --git a/blockchain/bin/node/src/main.rs b/blockchain/chains/qingdao/node/src/main.rs similarity index 100% rename from blockchain/bin/node/src/main.rs rename to blockchain/chains/qingdao/node/src/main.rs diff --git a/blockchain/bin/node/src/rpc.rs b/blockchain/chains/qingdao/node/src/rpc.rs similarity index 100% rename from blockchain/bin/node/src/rpc.rs rename to blockchain/chains/qingdao/node/src/rpc.rs diff --git a/blockchain/bin/node/src/service.rs b/blockchain/chains/qingdao/node/src/service.rs similarity index 100% rename from blockchain/bin/node/src/service.rs rename to blockchain/chains/qingdao/node/src/service.rs diff --git a/blockchain/bin/rpc/Pipfile b/blockchain/chains/qingdao/rpc/Pipfile similarity index 100% rename from blockchain/bin/rpc/Pipfile rename to blockchain/chains/qingdao/rpc/Pipfile diff --git a/blockchain/bin/rpc/Pipfile.lock b/blockchain/chains/qingdao/rpc/Pipfile.lock similarity index 100% rename from blockchain/bin/rpc/Pipfile.lock rename to blockchain/chains/qingdao/rpc/Pipfile.lock diff --git a/blockchain/bin/rpc/README.md b/blockchain/chains/qingdao/rpc/README.md similarity index 100% rename from blockchain/bin/rpc/README.md rename to blockchain/chains/qingdao/rpc/README.md diff --git a/blockchain/bin/rpc/nginx.conf b/blockchain/chains/qingdao/rpc/nginx.conf similarity index 100% rename from blockchain/bin/rpc/nginx.conf rename to blockchain/chains/qingdao/rpc/nginx.conf diff --git a/blockchain/bin/rpc/rpc.py b/blockchain/chains/qingdao/rpc/rpc.py similarity index 97% rename from blockchain/bin/rpc/rpc.py rename to blockchain/chains/qingdao/rpc/rpc.py index e8cc503cf..fba101b62 100644 --- a/blockchain/bin/rpc/rpc.py +++ b/blockchain/chains/qingdao/rpc/rpc.py @@ -1,7 +1,7 @@ from substrateinterface import SubstrateInterface import json -types = json.load(open("../resources/types.json", "r")) +types = json.load(open("../../resources/types.json", "r")) url = "http://127.0.0.1:9933" # url = "https://rpc-newrome.setheum.xyz" diff --git a/blockchain/bin/runtime/Cargo.toml b/blockchain/chains/qingdao/runtime/Cargo.toml similarity index 90% rename from blockchain/bin/runtime/Cargo.toml rename to blockchain/chains/qingdao/runtime/Cargo.toml index 6b73fb317..4b24b8e24 100644 --- a/blockchain/bin/runtime/Cargo.toml +++ b/blockchain/chains/qingdao/runtime/Cargo.toml @@ -89,22 +89,22 @@ orml-tokens = { path = "../../../submodules/orml/tokens", default-features = fal orml-traits = { path = "../../../submodules/orml/traits", default-features = false } orml-nft= { path = "../../../submodules/orml/nft", default-features = false } -module-transaction-pause = { path = "../../modules/transaction-pause", default-features = false } -module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } -module-airdrop = { path = "../../modules/airdrop", default-features = false } - -module-currencies = { path = "../../modules/currencies", default-features = false } -module-evm = { path = "../../modules/evm", default-features = false } -module-evm-accounts = { path = "../../modules/evm-accounts", default-features = false } -module-evm-bridge = { path = "../../modules/evm-bridge", default-features = false } -module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } -module-evm-manager = { path = "../../modules/evm-manager", default-features = false } - -module-nft = { path = "../../modules/nft", default-features = false } -module-prices = { path = "../../modules/prices", default-features = false } - -module-support = { path = "../../modules/support", default-features = false } -module-vesting = { path = "../../modules/vesting", default-features = false } +module-transaction-pause = { path = "../../../modules/transaction-pause", default-features = false } +module-transaction-payment = { path = "../../../modules/transaction-payment", default-features = false } +module-airdrop = { path = "../../../modules/airdrop", default-features = false } + +module-currencies = { path = "../../../modules/currencies", default-features = false } +module-evm = { path = "../../../modules/evm", default-features = false } +module-evm-accounts = { path = "../../../modules/evm-accounts", default-features = false } +module-evm-bridge = { path = "../../../modules/evm-bridge", default-features = false } +module-evm-rpc-runtime-api = { path = "../../../modules/evm/rpc/runtime_api", default-features = false } +module-evm-manager = { path = "../../../modules/evm-manager", default-features = false } + +module-nft = { path = "../../../modules/nft", default-features = false } +module-prices = { path = "../../../modules/prices", default-features = false } + +module-support = { path = "../../../modules/support", default-features = false } +module-vesting = { path = "../../../modules/vesting", default-features = false } primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } runtime-common = { path = "common", default-features = false } diff --git a/blockchain/bin/runtime/build.rs b/blockchain/chains/qingdao/runtime/build.rs similarity index 100% rename from blockchain/bin/runtime/build.rs rename to blockchain/chains/qingdao/runtime/build.rs diff --git a/blockchain/bin/runtime/common/Cargo.toml b/blockchain/chains/qingdao/runtime/common/Cargo.toml similarity index 76% rename from blockchain/bin/runtime/common/Cargo.toml rename to blockchain/chains/qingdao/runtime/common/Cargo.toml index c09b8f56f..2c91c4a7b 100644 --- a/blockchain/bin/runtime/common/Cargo.toml +++ b/blockchain/chains/qingdao/runtime/common/Cargo.toml @@ -23,11 +23,11 @@ pallet-membership = { git = "https://github.com/paritytech/substrate", branch = orml-oracle = { path = "../../submodules/orml/oracle", default-features = false } orml-traits = { path = "../../submodules/orml/traits", default-features = false } -module-evm = { path = "../../modules//evm", default-features = false } -module-support = { path = "../../modules/support", default-features = false } -module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } -primitives-proc-macro = { path = "../../primitives/proc-macro" } +module-evm = { path = "../../../modules//evm", default-features = false } +module-support = { path = "../../../modules/support", default-features = false } +module-transaction-payment = { path = "../../../modules/transaction-payment", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } +primitives-proc-macro = { path = "../primitives/proc-macro" } [dev-dependencies] serde_json = "1.0.41" @@ -41,13 +41,13 @@ pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "po orml-tokens = { path = "../../submodules/orml/tokens" } orml-nft = { path = "../../submodules/orml/nft" } -module-currencies = { path = "../../modules/currencies" } -module-evm-bridge = { path = "../../modules//evm-bridge" } -module-evm-manager = { path = "../../modules//evm-manager" } -module-nft = { path = "../../modules/nft" } -# module-dex = { path = "../../modules/defi/setswap/dex" } -module-prices = { path = "../../modules/prices" } -module-transaction-payment = { path = "../../modules/transaction-payment" } +module-currencies = { path = "../../../modules/currencies" } +module-evm-bridge = { path = "../../../modules//evm-bridge" } +module-evm-manager = { path = "../../../modules//evm-manager" } +module-nft = { path = "../../../modules/nft" } +# module-dex = { path = "../../../modules/defi/setswap/dex" } +module-prices = { path = "../../../modules/prices" } +module-transaction-payment = { path = "../../../modules/transaction-payment" } [features] default = ["std"] diff --git a/blockchain/bin/runtime/common/src/gas_to_weight_ratio.rs b/blockchain/chains/qingdao/runtime/common/src/gas_to_weight_ratio.rs similarity index 100% rename from blockchain/bin/runtime/common/src/gas_to_weight_ratio.rs rename to blockchain/chains/qingdao/runtime/common/src/gas_to_weight_ratio.rs diff --git a/blockchain/bin/runtime/common/src/lib.rs b/blockchain/chains/qingdao/runtime/common/src/lib.rs similarity index 100% rename from blockchain/bin/runtime/common/src/lib.rs rename to blockchain/chains/qingdao/runtime/common/src/lib.rs diff --git a/blockchain/bin/runtime/common/src/precompile/dex.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/dex.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/dex.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/dex.rs diff --git a/blockchain/bin/runtime/common/src/precompile/input.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/input.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/input.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/input.rs diff --git a/blockchain/bin/runtime/common/src/precompile/mock.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/mock.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/mock.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/mock.rs diff --git a/blockchain/bin/runtime/common/src/precompile/mod.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/mod.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/mod.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/mod.rs diff --git a/blockchain/bin/runtime/common/src/precompile/multicurrency.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/multicurrency.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/multicurrency.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/multicurrency.rs diff --git a/blockchain/bin/runtime/common/src/precompile/nft.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/nft.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/nft.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/nft.rs diff --git a/blockchain/bin/runtime/common/src/precompile/oracle.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/oracle.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/oracle.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/oracle.rs diff --git a/blockchain/bin/runtime/common/src/precompile/schedule_call.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/schedule_call.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/schedule_call.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/schedule_call.rs diff --git a/blockchain/bin/runtime/common/src/precompile/state_rent.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/state_rent.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/state_rent.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/state_rent.rs diff --git a/blockchain/bin/runtime/common/src/precompile/tests.rs b/blockchain/chains/qingdao/runtime/common/src/precompile/tests.rs similarity index 100% rename from blockchain/bin/runtime/common/src/precompile/tests.rs rename to blockchain/chains/qingdao/runtime/common/src/precompile/tests.rs diff --git a/blockchain/bin/runtime/common/src/weights/lib.rs b/blockchain/chains/qingdao/runtime/common/src/weights/lib.rs similarity index 100% rename from blockchain/bin/runtime/common/src/weights/lib.rs rename to blockchain/chains/qingdao/runtime/common/src/weights/lib.rs diff --git a/blockchain/bin/runtime/src/authority.rs b/blockchain/chains/qingdao/runtime/src/authority.rs similarity index 100% rename from blockchain/bin/runtime/src/authority.rs rename to blockchain/chains/qingdao/runtime/src/authority.rs diff --git a/blockchain/bin/runtime/src/benchmarking/auction.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/auction.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/auction.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/auction.rs diff --git a/blockchain/bin/runtime/src/benchmarking/auction_manager.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/auction_manager.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/auction_manager.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/auction_manager.rs diff --git a/blockchain/bin/runtime/src/benchmarking/authority.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/authority.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/authority.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/authority.rs diff --git a/blockchain/bin/runtime/src/benchmarking/cdp_engine.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/cdp_engine.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/cdp_engine.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/cdp_engine.rs diff --git a/blockchain/bin/runtime/src/benchmarking/cdp_treasury.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/cdp_treasury.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/cdp_treasury.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/cdp_treasury.rs diff --git a/blockchain/bin/runtime/src/benchmarking/currencies.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/currencies.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/currencies.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/currencies.rs diff --git a/blockchain/bin/runtime/src/benchmarking/dex.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/dex.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/dex.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/dex.rs diff --git a/blockchain/bin/runtime/src/benchmarking/dex_oracle.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/dex_oracle.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/dex_oracle.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/dex_oracle.rs diff --git a/blockchain/bin/runtime/src/benchmarking/emergency_shutdown.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/emergency_shutdown.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/emergency_shutdown.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/emergency_shutdown.rs diff --git a/blockchain/bin/runtime/src/benchmarking/evm.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/evm.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/evm.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/evm.rs diff --git a/blockchain/bin/runtime/src/benchmarking/evm_accounts.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/evm_accounts.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/evm_accounts.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/evm_accounts.rs diff --git a/blockchain/bin/runtime/src/benchmarking/mod.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/mod.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/mod.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/mod.rs diff --git a/blockchain/bin/runtime/src/benchmarking/oracle.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/oracle.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/oracle.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/oracle.rs diff --git a/blockchain/bin/runtime/src/benchmarking/prices.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/prices.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/prices.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/prices.rs diff --git a/blockchain/bin/runtime/src/benchmarking/serp_setmint.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/serp_setmint.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/serp_setmint.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/serp_setmint.rs diff --git a/blockchain/bin/runtime/src/benchmarking/serp_treasury.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/serp_treasury.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/serp_treasury.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/serp_treasury.rs diff --git a/blockchain/bin/runtime/src/benchmarking/tokens.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/tokens.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/tokens.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/tokens.rs diff --git a/blockchain/bin/runtime/src/benchmarking/transaction_pause.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/transaction_pause.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/transaction_pause.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/transaction_pause.rs diff --git a/blockchain/bin/runtime/src/benchmarking/transaction_payment.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/transaction_payment.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/transaction_payment.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/transaction_payment.rs diff --git a/blockchain/bin/runtime/src/benchmarking/utils.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/utils.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/utils.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/utils.rs diff --git a/blockchain/bin/runtime/src/benchmarking/vesting.rs b/blockchain/chains/qingdao/runtime/src/benchmarking/vesting.rs similarity index 100% rename from blockchain/bin/runtime/src/benchmarking/vesting.rs rename to blockchain/chains/qingdao/runtime/src/benchmarking/vesting.rs diff --git a/blockchain/bin/runtime/src/constants.rs b/blockchain/chains/qingdao/runtime/src/constants.rs similarity index 100% rename from blockchain/bin/runtime/src/constants.rs rename to blockchain/chains/qingdao/runtime/src/constants.rs diff --git a/blockchain/bin/runtime/src/lib.rs b/blockchain/chains/qingdao/runtime/src/lib.rs similarity index 100% rename from blockchain/bin/runtime/src/lib.rs rename to blockchain/chains/qingdao/runtime/src/lib.rs diff --git a/blockchain/bin/runtime/src/weights/dex_oracle.rs b/blockchain/chains/qingdao/runtime/src/weights/dex_oracle.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/dex_oracle.rs rename to blockchain/chains/qingdao/runtime/src/weights/dex_oracle.rs diff --git a/blockchain/bin/runtime/src/weights/emergency_shutdown.rs b/blockchain/chains/qingdao/runtime/src/weights/emergency_shutdown.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/emergency_shutdown.rs rename to blockchain/chains/qingdao/runtime/src/weights/emergency_shutdown.rs diff --git a/blockchain/bin/runtime/src/weights/mod.rs b/blockchain/chains/qingdao/runtime/src/weights/mod.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/mod.rs rename to blockchain/chains/qingdao/runtime/src/weights/mod.rs diff --git a/blockchain/bin/runtime/src/weights/module_auction_manager.rs b/blockchain/chains/qingdao/runtime/src/weights/module_auction_manager.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_auction_manager.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_auction_manager.rs diff --git a/blockchain/bin/runtime/src/weights/module_cdp_engine.rs b/blockchain/chains/qingdao/runtime/src/weights/module_cdp_engine.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_cdp_engine.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_cdp_engine.rs diff --git a/blockchain/bin/runtime/src/weights/module_cdp_treasury.rs b/blockchain/chains/qingdao/runtime/src/weights/module_cdp_treasury.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_cdp_treasury.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_cdp_treasury.rs diff --git a/blockchain/bin/runtime/src/weights/module_currencies.rs b/blockchain/chains/qingdao/runtime/src/weights/module_currencies.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_currencies.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_currencies.rs diff --git a/blockchain/bin/runtime/src/weights/module_dex.rs b/blockchain/chains/qingdao/runtime/src/weights/module_dex.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_dex.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_dex.rs diff --git a/blockchain/bin/runtime/src/weights/module_evm.rs b/blockchain/chains/qingdao/runtime/src/weights/module_evm.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_evm.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_evm.rs diff --git a/blockchain/bin/runtime/src/weights/module_evm_accounts.rs b/blockchain/chains/qingdao/runtime/src/weights/module_evm_accounts.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_evm_accounts.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_evm_accounts.rs diff --git a/blockchain/bin/runtime/src/weights/module_nft.rs b/blockchain/chains/qingdao/runtime/src/weights/module_nft.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_nft.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_nft.rs diff --git a/blockchain/bin/runtime/src/weights/module_prices.rs b/blockchain/chains/qingdao/runtime/src/weights/module_prices.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_prices.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_prices.rs diff --git a/blockchain/bin/runtime/src/weights/module_transaction_pause.rs b/blockchain/chains/qingdao/runtime/src/weights/module_transaction_pause.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_transaction_pause.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_transaction_pause.rs diff --git a/blockchain/bin/runtime/src/weights/module_transaction_payment.rs b/blockchain/chains/qingdao/runtime/src/weights/module_transaction_payment.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_transaction_payment.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_transaction_payment.rs diff --git a/blockchain/bin/runtime/src/weights/module_vesting.rs b/blockchain/chains/qingdao/runtime/src/weights/module_vesting.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/module_vesting.rs rename to blockchain/chains/qingdao/runtime/src/weights/module_vesting.rs diff --git a/blockchain/bin/runtime/src/weights/orml_auction.rs b/blockchain/chains/qingdao/runtime/src/weights/orml_auction.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/orml_auction.rs rename to blockchain/chains/qingdao/runtime/src/weights/orml_auction.rs diff --git a/blockchain/bin/runtime/src/weights/orml_authority.rs b/blockchain/chains/qingdao/runtime/src/weights/orml_authority.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/orml_authority.rs rename to blockchain/chains/qingdao/runtime/src/weights/orml_authority.rs diff --git a/blockchain/bin/runtime/src/weights/orml_oracle.rs b/blockchain/chains/qingdao/runtime/src/weights/orml_oracle.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/orml_oracle.rs rename to blockchain/chains/qingdao/runtime/src/weights/orml_oracle.rs diff --git a/blockchain/bin/runtime/src/weights/orml_tokens.rs b/blockchain/chains/qingdao/runtime/src/weights/orml_tokens.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/orml_tokens.rs rename to blockchain/chains/qingdao/runtime/src/weights/orml_tokens.rs diff --git a/blockchain/bin/runtime/src/weights/serp_setmint.rs b/blockchain/chains/qingdao/runtime/src/weights/serp_setmint.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/serp_setmint.rs rename to blockchain/chains/qingdao/runtime/src/weights/serp_setmint.rs diff --git a/blockchain/bin/runtime/src/weights/serp_treasury.rs b/blockchain/chains/qingdao/runtime/src/weights/serp_treasury.rs similarity index 100% rename from blockchain/bin/runtime/src/weights/serp_treasury.rs rename to blockchain/chains/qingdao/runtime/src/weights/serp_treasury.rs diff --git a/blockchain/bin/runtime/tests/solidity_test/Address.json b/blockchain/chains/qingdao/runtime/tests/solidity_test/Address.json similarity index 100% rename from blockchain/bin/runtime/tests/solidity_test/Address.json rename to blockchain/chains/qingdao/runtime/tests/solidity_test/Address.json diff --git a/blockchain/bin/runtime/tests/solidity_test/Counters.json b/blockchain/chains/qingdao/runtime/tests/solidity_test/Counters.json similarity index 100% rename from blockchain/bin/runtime/tests/solidity_test/Counters.json rename to blockchain/chains/qingdao/runtime/tests/solidity_test/Counters.json diff --git a/blockchain/bin/runtime/tests/solidity_test/TokenMock.json b/blockchain/chains/qingdao/runtime/tests/solidity_test/TokenMock.json similarity index 100% rename from blockchain/bin/runtime/tests/solidity_test/TokenMock.json rename to blockchain/chains/qingdao/runtime/tests/solidity_test/TokenMock.json diff --git a/blockchain/bin/runtime/tests/weights_test.rs b/blockchain/chains/qingdao/runtime/tests/weights_test.rs similarity index 100% rename from blockchain/bin/runtime/tests/weights_test.rs rename to blockchain/chains/qingdao/runtime/tests/weights_test.rs diff --git a/blockchain/modules/airdrop/Cargo.toml b/blockchain/modules/airdrop/Cargo.toml index bcb7eaf06..f536d3ad0 100644 --- a/blockchain/modules/airdrop/Cargo.toml +++ b/blockchain/modules/airdrop/Cargo.toml @@ -14,7 +14,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v orml-traits = { package = "orml-traits", path = "../../submodules/orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } diff --git a/blockchain/modules/currencies/Cargo.toml b/blockchain/modules/currencies/Cargo.toml index f3d0a6ba8..1c537adfe 100644 --- a/blockchain/modules/currencies/Cargo.toml +++ b/blockchain/modules/currencies/Cargo.toml @@ -18,7 +18,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk orml-traits = { path = "../../submodules/orml/traits", default-features = false } orml-utilities = { path = "../../submodules/orml/utilities", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] diff --git a/blockchain/modules/currencies/src/weights.rs b/blockchain/modules/currencies/src/weights.rs index 20de9b665..f2e868f3a 100644 --- a/blockchain/modules/currencies/src/weights.rs +++ b/blockchain/modules/currencies/src/weights.rs @@ -36,7 +36,7 @@ // --wasm-execution=compiled // --heap-pages=4096 // --template=.maintain/module-weight-template.hbs -// --output=./modules/currencies/src/weights.rs +// --output=./blockchain/modules/currencies/src/weights.rs #![cfg_attr(rustfmt, rustfmt_skip)] diff --git a/blockchain/modules/evm-accounts/Cargo.toml b/blockchain/modules/evm-accounts/Cargo.toml index 2c7dec917..566ba9780 100644 --- a/blockchain/modules/evm-accounts/Cargo.toml +++ b/blockchain/modules/evm-accounts/Cargo.toml @@ -18,7 +18,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v orml-traits = { path = "../../submodules/orml/traits", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] diff --git a/blockchain/modules/evm-accounts/src/weights.rs b/blockchain/modules/evm-accounts/src/weights.rs index 3bb84537c..119bf1a3b 100644 --- a/blockchain/modules/evm-accounts/src/weights.rs +++ b/blockchain/modules/evm-accounts/src/weights.rs @@ -36,7 +36,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/evm-accounts/src/weights.rs +// --output=./blockchain/modules/evm-accounts/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/evm-bridge/Cargo.toml b/blockchain/modules/evm-bridge/Cargo.toml index e32ead735..7e5fc40ac 100644 --- a/blockchain/modules/evm-bridge/Cargo.toml +++ b/blockchain/modules/evm-bridge/Cargo.toml @@ -20,8 +20,8 @@ primitive-types = { version = "0.10.0", default-features = false, features = ["r impl-trait-for-tuples = "0.2.1" ethereum-types = { version = "0.12.0", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } -primitives-proc-macro = { path = "../../primitives/proc-macro" } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } +primitives-proc-macro = { path = "../primitives/proc-macro" } support = { package = "module-support", path = "../support", default-features = false } module-evm = { path = "../evm", default-features = false } num_enum = { version = "0.5.1", default-features = false } diff --git a/blockchain/modules/evm-manager/Cargo.toml b/blockchain/modules/evm-manager/Cargo.toml index a1f084b89..f1d6f694b 100644 --- a/blockchain/modules/evm-manager/Cargo.toml +++ b/blockchain/modules/evm-manager/Cargo.toml @@ -15,7 +15,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] diff --git a/blockchain/modules/evm/Cargo.toml b/blockchain/modules/evm/Cargo.toml index acf5b0230..84a82bfc0 100644 --- a/blockchain/modules/evm/Cargo.toml +++ b/blockchain/modules/evm/Cargo.toml @@ -31,7 +31,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v orml-traits = { path = "../../submodules/orml/traits", default-features = false } module-support = { path = "../support", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } [dev-dependencies] env_logger = "0.7" diff --git a/blockchain/modules/evm/rpc/runtime_api/Cargo.toml b/blockchain/modules/evm/rpc/runtime_api/Cargo.toml index 672fae304..f44402112 100644 --- a/blockchain/modules/evm/rpc/runtime_api/Cargo.toml +++ b/blockchain/modules/evm/rpc/runtime_api/Cargo.toml @@ -11,7 +11,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } ethereum-types = { version = "0.12", default-features = false } -primitives = { package = "setheum-primitives", path = "../../../../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../../../../primitives", default-features = false } [features] default = ["std"] diff --git a/blockchain/modules/evm/src/weights.rs b/blockchain/modules/evm/src/weights.rs index 19af0ee21..71206d556 100644 --- a/blockchain/modules/evm/src/weights.rs +++ b/blockchain/modules/evm/src/weights.rs @@ -36,7 +36,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/evm/src/weights.rs +// --output=./blockchain/modules/evm/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/idle-scheduler/Cargo.toml b/blockchain/modules/idle-scheduler/Cargo.toml index 3f010633a..05691b8f8 100644 --- a/blockchain/modules/idle-scheduler/Cargo.toml +++ b/blockchain/modules/idle-scheduler/Cargo.toml @@ -13,7 +13,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -setheum-primitives = { path = "../../primitives", default-features = false } +setheum-primitives = { path = "../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] diff --git a/blockchain/modules/idle-scheduler/src/weights.rs b/blockchain/modules/idle-scheduler/src/weights.rs index beb16dbe1..bcef9191a 100644 --- a/blockchain/modules/idle-scheduler/src/weights.rs +++ b/blockchain/modules/idle-scheduler/src/weights.rs @@ -36,7 +36,7 @@ // --wasm-execution=compiled // --heap-pages=4096 // --template=.maintain/module-weight-template.hbs -// --output=./modules/idle-scheduler/src/weights.rs +// --output=./blockchain/modules/idle-scheduler/src/weights.rs #![cfg_attr(rustfmt, rustfmt_skip)] diff --git a/blockchain/modules/nft/Cargo.toml b/blockchain/modules/nft/Cargo.toml index 78002473d..742d075a9 100644 --- a/blockchain/modules/nft/Cargo.toml +++ b/blockchain/modules/nft/Cargo.toml @@ -19,7 +19,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v orml-nft = { path = "../../submodules/orml/nft", default-features = false } orml-traits = { path = "../../submodules/orml/traits", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } diff --git a/blockchain/modules/nft/src/weights.rs b/blockchain/modules/nft/src/weights.rs index 43447b0b1..8893ce582 100644 --- a/blockchain/modules/nft/src/weights.rs +++ b/blockchain/modules/nft/src/weights.rs @@ -35,7 +35,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/nft/src/weights.rs +// --output=./blockchain/modules/nft/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/prices/Cargo.toml b/blockchain/modules/prices/Cargo.toml index ec4ee5a50..c9130e599 100644 --- a/blockchain/modules/prices/Cargo.toml +++ b/blockchain/modules/prices/Cargo.toml @@ -16,7 +16,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v orml-traits = { package = "orml-traits", path = "../../submodules/orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } diff --git a/blockchain/modules/prices/src/weights.rs b/blockchain/modules/prices/src/weights.rs index 9b8e6fc1c..18537e7ef 100644 --- a/blockchain/modules/prices/src/weights.rs +++ b/blockchain/modules/prices/src/weights.rs @@ -36,7 +36,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/prices/src/weights.rs +// --output=./blockchain/modules/prices/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/support/Cargo.toml b/blockchain/modules/support/Cargo.toml index 27a7bb47f..27404a087 100644 --- a/blockchain/modules/support/Cargo.toml +++ b/blockchain/modules/support/Cargo.toml @@ -14,7 +14,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } [features] default = ["std"] diff --git a/blockchain/modules/transaction-pause/Cargo.toml b/blockchain/modules/transaction-pause/Cargo.toml index 87a57b755..d62cff68e 100644 --- a/blockchain/modules/transaction-pause/Cargo.toml +++ b/blockchain/modules/transaction-pause/Cargo.toml @@ -13,7 +13,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../submodules/orml/traits", default-features = false } diff --git a/blockchain/modules/transaction-pause/src/weights.rs b/blockchain/modules/transaction-pause/src/weights.rs index dabf7843b..64da5db99 100644 --- a/blockchain/modules/transaction-pause/src/weights.rs +++ b/blockchain/modules/transaction-pause/src/weights.rs @@ -35,7 +35,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/transaction-pause/src/weights.rs +// --output=./blockchain/modules/transaction-pause/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/transaction-payment/Cargo.toml b/blockchain/modules/transaction-payment/Cargo.toml index 42997df10..d375dab5f 100644 --- a/blockchain/modules/transaction-payment/Cargo.toml +++ b/blockchain/modules/transaction-payment/Cargo.toml @@ -15,7 +15,7 @@ sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0. pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../submodules/orml/traits", default-features = false } diff --git a/blockchain/modules/transaction-payment/src/weights.rs b/blockchain/modules/transaction-payment/src/weights.rs index b05b3d92f..b59e76c7f 100644 --- a/blockchain/modules/transaction-payment/src/weights.rs +++ b/blockchain/modules/transaction-payment/src/weights.rs @@ -36,7 +36,7 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./modules/transaction-payment/src/weights.rs +// --output=./blockchain/modules/transaction-payment/src/weights.rs // --template=.maintain/module-weight-template.hbs diff --git a/blockchain/modules/vesting/Cargo.toml b/blockchain/modules/vesting/Cargo.toml index 32db60d95..f77ec5346 100644 --- a/blockchain/modules/vesting/Cargo.toml +++ b/blockchain/modules/vesting/Cargo.toml @@ -14,7 +14,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false } +primitives = { package = "setheum-primitives", path = "../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../submodules/orml/traits", default-features = false } diff --git a/primitives/Cargo.toml b/blockchain/primitives/Cargo.toml similarity index 100% rename from primitives/Cargo.toml rename to blockchain/primitives/Cargo.toml diff --git a/primitives/proc-macro/Cargo.toml b/blockchain/primitives/proc-macro/Cargo.toml similarity index 100% rename from primitives/proc-macro/Cargo.toml rename to blockchain/primitives/proc-macro/Cargo.toml diff --git a/primitives/proc-macro/src/lib.rs b/blockchain/primitives/proc-macro/src/lib.rs similarity index 100% rename from primitives/proc-macro/src/lib.rs rename to blockchain/primitives/proc-macro/src/lib.rs diff --git a/primitives/src/currency.rs b/blockchain/primitives/src/currency.rs similarity index 100% rename from primitives/src/currency.rs rename to blockchain/primitives/src/currency.rs diff --git a/primitives/src/evm.rs b/blockchain/primitives/src/evm.rs similarity index 100% rename from primitives/src/evm.rs rename to blockchain/primitives/src/evm.rs diff --git a/primitives/src/lib.rs b/blockchain/primitives/src/lib.rs similarity index 100% rename from primitives/src/lib.rs rename to blockchain/primitives/src/lib.rs diff --git a/primitives/src/signature.rs b/blockchain/primitives/src/signature.rs similarity index 100% rename from primitives/src/signature.rs rename to blockchain/primitives/src/signature.rs diff --git a/primitives/src/task.rs b/blockchain/primitives/src/task.rs similarity index 100% rename from primitives/src/task.rs rename to blockchain/primitives/src/task.rs diff --git a/primitives/src/tests.rs b/blockchain/primitives/src/tests.rs similarity index 100% rename from primitives/src/tests.rs rename to blockchain/primitives/src/tests.rs diff --git a/blockchain/bin/resources/chain_spec_mainnet.json b/blockchain/resources/chain_spec_mainnet.json similarity index 100% rename from blockchain/bin/resources/chain_spec_mainnet.json rename to blockchain/resources/chain_spec_mainnet.json diff --git a/blockchain/bin/resources/chain_spec_mainnet_raw.json b/blockchain/resources/chain_spec_mainnet_raw.json similarity index 100% rename from blockchain/bin/resources/chain_spec_mainnet_raw.json rename to blockchain/resources/chain_spec_mainnet_raw.json diff --git a/blockchain/bin/resources/chain_spec_testnet.json b/blockchain/resources/chain_spec_testnet.json similarity index 100% rename from blockchain/bin/resources/chain_spec_testnet.json rename to blockchain/resources/chain_spec_testnet.json diff --git a/blockchain/bin/resources/chain_spec_testnet_raw.json b/blockchain/resources/chain_spec_testnet_raw.json similarity index 100% rename from blockchain/bin/resources/chain_spec_testnet_raw.json rename to blockchain/resources/chain_spec_testnet_raw.json diff --git a/blockchain/bin/resources/types.json b/blockchain/resources/types.json similarity index 100% rename from blockchain/bin/resources/types.json rename to blockchain/resources/types.json