Serparate chains (starting with qingdao) and move primitives into…

… `blockchain`
Setheum-Labs · Feb 13, 2024 · c4c355c · c4c355c
1 parent 3682dd8
commit c4c355c
Show file tree

Hide file tree

Showing 115 changed files with 59 additions and 59 deletions.
diff --git a/blockchain/bin/node/Cargo.toml → blockchain/chains/qingdao/node/Cargo.toml b/blockchain/bin/node/Cargo.toml → 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 → blockchain/chains/qingdao/node/build.rs b/blockchain/bin/node/build.rs → blockchain/chains/qingdao/node/build.rs
diff --git a/blockchain/bin/node/src/chain_spec.rs → ...ain/chains/qingdao/node/src/chain_spec.rs b/blockchain/bin/node/src/chain_spec.rs → ...ain/chains/qingdao/node/src/chain_spec.rs
@@ -303,11 +303,11 @@ pub fn public_testnet_config() -> Result<ChainSpec, String> {
 
 
 pub fn live_mainnet_config() -> Result<ChainSpec, String> {
-	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, String> {
-	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<ChainSpec, String> {

diff --git a/blockchain/bin/node/src/cli.rs → blockchain/chains/qingdao/node/src/cli.rs b/blockchain/bin/node/src/cli.rs → blockchain/chains/qingdao/node/src/cli.rs
diff --git a/blockchain/bin/node/src/command.rs → ...kchain/chains/qingdao/node/src/command.rs b/blockchain/bin/node/src/command.rs → ...kchain/chains/qingdao/node/src/command.rs
diff --git a/blockchain/bin/node/src/lib.rs → blockchain/chains/qingdao/node/src/lib.rs b/blockchain/bin/node/src/lib.rs → blockchain/chains/qingdao/node/src/lib.rs
diff --git a/blockchain/bin/node/src/main.rs → blockchain/chains/qingdao/node/src/main.rs b/blockchain/bin/node/src/main.rs → blockchain/chains/qingdao/node/src/main.rs
diff --git a/blockchain/bin/node/src/rpc.rs → blockchain/chains/qingdao/node/src/rpc.rs b/blockchain/bin/node/src/rpc.rs → blockchain/chains/qingdao/node/src/rpc.rs
diff --git a/blockchain/bin/node/src/service.rs → ...kchain/chains/qingdao/node/src/service.rs b/blockchain/bin/node/src/service.rs → ...kchain/chains/qingdao/node/src/service.rs
diff --git a/blockchain/bin/rpc/Pipfile → blockchain/chains/qingdao/rpc/Pipfile b/blockchain/bin/rpc/Pipfile → blockchain/chains/qingdao/rpc/Pipfile
diff --git a/blockchain/bin/rpc/Pipfile.lock → blockchain/chains/qingdao/rpc/Pipfile.lock b/blockchain/bin/rpc/Pipfile.lock → blockchain/chains/qingdao/rpc/Pipfile.lock
diff --git a/blockchain/bin/rpc/README.md → blockchain/chains/qingdao/rpc/README.md b/blockchain/bin/rpc/README.md → blockchain/chains/qingdao/rpc/README.md
diff --git a/blockchain/bin/rpc/nginx.conf → blockchain/chains/qingdao/rpc/nginx.conf b/blockchain/bin/rpc/nginx.conf → blockchain/chains/qingdao/rpc/nginx.conf
diff --git a/blockchain/bin/rpc/rpc.py → blockchain/chains/qingdao/rpc/rpc.py b/blockchain/bin/rpc/rpc.py → 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 → blockchain/chains/qingdao/runtime/Cargo.toml b/blockchain/bin/runtime/Cargo.toml → 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 → blockchain/chains/qingdao/runtime/build.rs b/blockchain/bin/runtime/build.rs → blockchain/chains/qingdao/runtime/build.rs
diff --git a/blockchain/bin/runtime/common/Cargo.toml → .../chains/qingdao/runtime/common/Cargo.toml b/blockchain/bin/runtime/common/Cargo.toml → .../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/...runtime/common/src/gas_to_weight_ratio.rs → ...runtime/common/src/gas_to_weight_ratio.rs b/...runtime/common/src/gas_to_weight_ratio.rs → ...runtime/common/src/gas_to_weight_ratio.rs
diff --git a/blockchain/bin/runtime/common/src/lib.rs → .../chains/qingdao/runtime/common/src/lib.rs b/blockchain/bin/runtime/common/src/lib.rs → .../chains/qingdao/runtime/common/src/lib.rs
diff --git a/.../bin/runtime/common/src/precompile/dex.rs → ...gdao/runtime/common/src/precompile/dex.rs b/.../bin/runtime/common/src/precompile/dex.rs → ...gdao/runtime/common/src/precompile/dex.rs
diff --git a/...in/runtime/common/src/precompile/input.rs → ...ao/runtime/common/src/precompile/input.rs b/...in/runtime/common/src/precompile/input.rs → ...ao/runtime/common/src/precompile/input.rs
diff --git a/...bin/runtime/common/src/precompile/mock.rs → ...dao/runtime/common/src/precompile/mock.rs b/...bin/runtime/common/src/precompile/mock.rs → ...dao/runtime/common/src/precompile/mock.rs
diff --git a/.../bin/runtime/common/src/precompile/mod.rs → ...gdao/runtime/common/src/precompile/mod.rs b/.../bin/runtime/common/src/precompile/mod.rs → ...gdao/runtime/common/src/precompile/mod.rs
diff --git a/...me/common/src/precompile/multicurrency.rs → ...me/common/src/precompile/multicurrency.rs b/...me/common/src/precompile/multicurrency.rs → ...me/common/src/precompile/multicurrency.rs
diff --git a/.../bin/runtime/common/src/precompile/nft.rs → ...gdao/runtime/common/src/precompile/nft.rs b/.../bin/runtime/common/src/precompile/nft.rs → ...gdao/runtime/common/src/precompile/nft.rs
diff --git a/...n/runtime/common/src/precompile/oracle.rs → ...o/runtime/common/src/precompile/oracle.rs b/...n/runtime/common/src/precompile/oracle.rs → ...o/runtime/common/src/precompile/oracle.rs
diff --git a/...me/common/src/precompile/schedule_call.rs → ...me/common/src/precompile/schedule_call.rs b/...me/common/src/precompile/schedule_call.rs → ...me/common/src/precompile/schedule_call.rs
diff --git a/...ntime/common/src/precompile/state_rent.rs → ...ntime/common/src/precompile/state_rent.rs b/...ntime/common/src/precompile/state_rent.rs → ...ntime/common/src/precompile/state_rent.rs
diff --git a/...in/runtime/common/src/precompile/tests.rs → ...ao/runtime/common/src/precompile/tests.rs b/...in/runtime/common/src/precompile/tests.rs → ...ao/runtime/common/src/precompile/tests.rs
diff --git a/...ain/bin/runtime/common/src/weights/lib.rs → ...qingdao/runtime/common/src/weights/lib.rs b/...ain/bin/runtime/common/src/weights/lib.rs → ...qingdao/runtime/common/src/weights/lib.rs
diff --git a/blockchain/bin/runtime/src/authority.rs → ...n/chains/qingdao/runtime/src/authority.rs b/blockchain/bin/runtime/src/authority.rs → ...n/chains/qingdao/runtime/src/authority.rs
diff --git a/...n/bin/runtime/src/benchmarking/auction.rs → ...ngdao/runtime/src/benchmarking/auction.rs b/...n/bin/runtime/src/benchmarking/auction.rs → ...ngdao/runtime/src/benchmarking/auction.rs
diff --git a/...ntime/src/benchmarking/auction_manager.rs → ...ntime/src/benchmarking/auction_manager.rs b/...ntime/src/benchmarking/auction_manager.rs → ...ntime/src/benchmarking/auction_manager.rs
diff --git a/...bin/runtime/src/benchmarking/authority.rs → ...dao/runtime/src/benchmarking/authority.rs b/...bin/runtime/src/benchmarking/authority.rs → ...dao/runtime/src/benchmarking/authority.rs
diff --git a/...in/runtime/src/benchmarking/cdp_engine.rs → ...ao/runtime/src/benchmarking/cdp_engine.rs b/...in/runtime/src/benchmarking/cdp_engine.rs → ...ao/runtime/src/benchmarking/cdp_engine.rs
diff --git a/.../runtime/src/benchmarking/cdp_treasury.rs → .../runtime/src/benchmarking/cdp_treasury.rs b/.../runtime/src/benchmarking/cdp_treasury.rs → .../runtime/src/benchmarking/cdp_treasury.rs
diff --git a/...in/runtime/src/benchmarking/currencies.rs → ...ao/runtime/src/benchmarking/currencies.rs b/...in/runtime/src/benchmarking/currencies.rs → ...ao/runtime/src/benchmarking/currencies.rs
diff --git a/...chain/bin/runtime/src/benchmarking/dex.rs → ...s/qingdao/runtime/src/benchmarking/dex.rs b/...chain/bin/runtime/src/benchmarking/dex.rs → ...s/qingdao/runtime/src/benchmarking/dex.rs
diff --git a/...in/runtime/src/benchmarking/dex_oracle.rs → ...ao/runtime/src/benchmarking/dex_oracle.rs b/...in/runtime/src/benchmarking/dex_oracle.rs → ...ao/runtime/src/benchmarking/dex_oracle.rs
diff --git a/...me/src/benchmarking/emergency_shutdown.rs → ...me/src/benchmarking/emergency_shutdown.rs b/...me/src/benchmarking/emergency_shutdown.rs → ...me/src/benchmarking/emergency_shutdown.rs
diff --git a/...chain/bin/runtime/src/benchmarking/evm.rs → ...s/qingdao/runtime/src/benchmarking/evm.rs b/...chain/bin/runtime/src/benchmarking/evm.rs → ...s/qingdao/runtime/src/benchmarking/evm.rs
diff --git a/.../runtime/src/benchmarking/evm_accounts.rs → .../runtime/src/benchmarking/evm_accounts.rs b/.../runtime/src/benchmarking/evm_accounts.rs → .../runtime/src/benchmarking/evm_accounts.rs
diff --git a/...chain/bin/runtime/src/benchmarking/mod.rs → ...s/qingdao/runtime/src/benchmarking/mod.rs b/...chain/bin/runtime/src/benchmarking/mod.rs → ...s/qingdao/runtime/src/benchmarking/mod.rs
diff --git a/...in/bin/runtime/src/benchmarking/oracle.rs → ...ingdao/runtime/src/benchmarking/oracle.rs b/...in/bin/runtime/src/benchmarking/oracle.rs → ...ingdao/runtime/src/benchmarking/oracle.rs
diff --git a/...in/bin/runtime/src/benchmarking/prices.rs → ...ingdao/runtime/src/benchmarking/prices.rs b/...in/bin/runtime/src/benchmarking/prices.rs → ...ingdao/runtime/src/benchmarking/prices.rs
diff --git a/.../runtime/src/benchmarking/serp_setmint.rs → .../runtime/src/benchmarking/serp_setmint.rs b/.../runtime/src/benchmarking/serp_setmint.rs → .../runtime/src/benchmarking/serp_setmint.rs
diff --git a/...runtime/src/benchmarking/serp_treasury.rs → ...runtime/src/benchmarking/serp_treasury.rs b/...runtime/src/benchmarking/serp_treasury.rs → ...runtime/src/benchmarking/serp_treasury.rs
diff --git a/...in/bin/runtime/src/benchmarking/tokens.rs → ...ingdao/runtime/src/benchmarking/tokens.rs b/...in/bin/runtime/src/benchmarking/tokens.rs → ...ingdao/runtime/src/benchmarking/tokens.rs
diff --git a/...ime/src/benchmarking/transaction_pause.rs → ...ime/src/benchmarking/transaction_pause.rs b/...ime/src/benchmarking/transaction_pause.rs → ...ime/src/benchmarking/transaction_pause.rs
diff --git a/...e/src/benchmarking/transaction_payment.rs → ...e/src/benchmarking/transaction_payment.rs b/...e/src/benchmarking/transaction_payment.rs → ...e/src/benchmarking/transaction_payment.rs
diff --git a/...ain/bin/runtime/src/benchmarking/utils.rs → ...qingdao/runtime/src/benchmarking/utils.rs b/...ain/bin/runtime/src/benchmarking/utils.rs → ...qingdao/runtime/src/benchmarking/utils.rs
diff --git a/...n/bin/runtime/src/benchmarking/vesting.rs → ...ngdao/runtime/src/benchmarking/vesting.rs b/...n/bin/runtime/src/benchmarking/vesting.rs → ...ngdao/runtime/src/benchmarking/vesting.rs
diff --git a/blockchain/bin/runtime/src/constants.rs → ...n/chains/qingdao/runtime/src/constants.rs b/blockchain/bin/runtime/src/constants.rs → ...n/chains/qingdao/runtime/src/constants.rs
diff --git a/blockchain/bin/runtime/src/lib.rs → blockchain/chains/qingdao/runtime/src/lib.rs b/blockchain/bin/runtime/src/lib.rs → blockchain/chains/qingdao/runtime/src/lib.rs
diff --git a/...ain/bin/runtime/src/weights/dex_oracle.rs → ...qingdao/runtime/src/weights/dex_oracle.rs b/...ain/bin/runtime/src/weights/dex_oracle.rs → ...qingdao/runtime/src/weights/dex_oracle.rs
diff --git a/...runtime/src/weights/emergency_shutdown.rs → ...runtime/src/weights/emergency_shutdown.rs b/...runtime/src/weights/emergency_shutdown.rs → ...runtime/src/weights/emergency_shutdown.rs
diff --git a/blockchain/bin/runtime/src/weights/mod.rs → ...chains/qingdao/runtime/src/weights/mod.rs b/blockchain/bin/runtime/src/weights/mod.rs → ...chains/qingdao/runtime/src/weights/mod.rs
diff --git a/...ime/src/weights/module_auction_manager.rs → ...ime/src/weights/module_auction_manager.rs b/...ime/src/weights/module_auction_manager.rs → ...ime/src/weights/module_auction_manager.rs
diff --git a/.../runtime/src/weights/module_cdp_engine.rs → .../runtime/src/weights/module_cdp_engine.rs b/.../runtime/src/weights/module_cdp_engine.rs → .../runtime/src/weights/module_cdp_engine.rs
diff --git a/...untime/src/weights/module_cdp_treasury.rs → ...untime/src/weights/module_cdp_treasury.rs b/...untime/src/weights/module_cdp_treasury.rs → ...untime/src/weights/module_cdp_treasury.rs
diff --git a/.../runtime/src/weights/module_currencies.rs → .../runtime/src/weights/module_currencies.rs b/.../runtime/src/weights/module_currencies.rs → .../runtime/src/weights/module_currencies.rs
diff --git a/...ain/bin/runtime/src/weights/module_dex.rs → ...qingdao/runtime/src/weights/module_dex.rs b/...ain/bin/runtime/src/weights/module_dex.rs → ...qingdao/runtime/src/weights/module_dex.rs
diff --git a/...ain/bin/runtime/src/weights/module_evm.rs → ...qingdao/runtime/src/weights/module_evm.rs b/...ain/bin/runtime/src/weights/module_evm.rs → ...qingdao/runtime/src/weights/module_evm.rs
diff --git a/...untime/src/weights/module_evm_accounts.rs → ...untime/src/weights/module_evm_accounts.rs b/...untime/src/weights/module_evm_accounts.rs → ...untime/src/weights/module_evm_accounts.rs
diff --git a/...ain/bin/runtime/src/weights/module_nft.rs → ...qingdao/runtime/src/weights/module_nft.rs b/...ain/bin/runtime/src/weights/module_nft.rs → ...qingdao/runtime/src/weights/module_nft.rs
diff --git a/.../bin/runtime/src/weights/module_prices.rs → ...gdao/runtime/src/weights/module_prices.rs b/.../bin/runtime/src/weights/module_prices.rs → ...gdao/runtime/src/weights/module_prices.rs
diff --git a/...e/src/weights/module_transaction_pause.rs → ...e/src/weights/module_transaction_pause.rs b/...e/src/weights/module_transaction_pause.rs → ...e/src/weights/module_transaction_pause.rs
diff --git a/...src/weights/module_transaction_payment.rs → ...src/weights/module_transaction_payment.rs b/...src/weights/module_transaction_payment.rs → ...src/weights/module_transaction_payment.rs
diff --git a/...bin/runtime/src/weights/module_vesting.rs → ...dao/runtime/src/weights/module_vesting.rs b/...bin/runtime/src/weights/module_vesting.rs → ...dao/runtime/src/weights/module_vesting.rs
diff --git a/...n/bin/runtime/src/weights/orml_auction.rs → ...ngdao/runtime/src/weights/orml_auction.rs b/...n/bin/runtime/src/weights/orml_auction.rs → ...ngdao/runtime/src/weights/orml_auction.rs
diff --git a/...bin/runtime/src/weights/orml_authority.rs → ...dao/runtime/src/weights/orml_authority.rs b/...bin/runtime/src/weights/orml_authority.rs → ...dao/runtime/src/weights/orml_authority.rs
diff --git a/...in/bin/runtime/src/weights/orml_oracle.rs → ...ingdao/runtime/src/weights/orml_oracle.rs b/...in/bin/runtime/src/weights/orml_oracle.rs → ...ingdao/runtime/src/weights/orml_oracle.rs
diff --git a/...in/bin/runtime/src/weights/orml_tokens.rs → ...ingdao/runtime/src/weights/orml_tokens.rs b/...in/bin/runtime/src/weights/orml_tokens.rs → ...ingdao/runtime/src/weights/orml_tokens.rs
diff --git a/...n/bin/runtime/src/weights/serp_setmint.rs → ...ngdao/runtime/src/weights/serp_setmint.rs b/...n/bin/runtime/src/weights/serp_setmint.rs → ...ngdao/runtime/src/weights/serp_setmint.rs
diff --git a/.../bin/runtime/src/weights/serp_treasury.rs → ...gdao/runtime/src/weights/serp_treasury.rs b/.../bin/runtime/src/weights/serp_treasury.rs → ...gdao/runtime/src/weights/serp_treasury.rs
diff --git a/.../runtime/tests/solidity_test/Address.json → .../runtime/tests/solidity_test/Address.json b/.../runtime/tests/solidity_test/Address.json → .../runtime/tests/solidity_test/Address.json
diff --git a/...runtime/tests/solidity_test/Counters.json → ...runtime/tests/solidity_test/Counters.json b/...runtime/tests/solidity_test/Counters.json → ...runtime/tests/solidity_test/Counters.json
diff --git a/...untime/tests/solidity_test/TokenMock.json → ...untime/tests/solidity_test/TokenMock.json b/...untime/tests/solidity_test/TokenMock.json → ...untime/tests/solidity_test/TokenMock.json
diff --git a/blockchain/bin/runtime/tests/weights_test.rs → ...ins/qingdao/runtime/tests/weights_test.rs b/blockchain/bin/runtime/tests/weights_test.rs → ...ins/qingdao/runtime/tests/weights_test.rs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → blockchain/primitives/Cargo.toml b/primitives/Cargo.toml → blockchain/primitives/Cargo.toml
diff --git a/primitives/proc-macro/Cargo.toml → blockchain/primitives/proc-macro/Cargo.toml b/primitives/proc-macro/Cargo.toml → blockchain/primitives/proc-macro/Cargo.toml
diff --git a/primitives/proc-macro/src/lib.rs → blockchain/primitives/proc-macro/src/lib.rs b/primitives/proc-macro/src/lib.rs → blockchain/primitives/proc-macro/src/lib.rs
diff --git a/primitives/src/currency.rs → blockchain/primitives/src/currency.rs b/primitives/src/currency.rs → blockchain/primitives/src/currency.rs
diff --git a/primitives/src/evm.rs → blockchain/primitives/src/evm.rs b/primitives/src/evm.rs → blockchain/primitives/src/evm.rs
diff --git a/primitives/src/lib.rs → blockchain/primitives/src/lib.rs b/primitives/src/lib.rs → blockchain/primitives/src/lib.rs
diff --git a/primitives/src/signature.rs → blockchain/primitives/src/signature.rs b/primitives/src/signature.rs → blockchain/primitives/src/signature.rs
diff --git a/primitives/src/task.rs → blockchain/primitives/src/task.rs b/primitives/src/task.rs → blockchain/primitives/src/task.rs
diff --git a/primitives/src/tests.rs → blockchain/primitives/src/tests.rs b/primitives/src/tests.rs → blockchain/primitives/src/tests.rs
diff --git a/...ain/bin/resources/chain_spec_mainnet.json → blockchain/resources/chain_spec_mainnet.json b/...ain/bin/resources/chain_spec_mainnet.json → blockchain/resources/chain_spec_mainnet.json
diff --git a/...bin/resources/chain_spec_mainnet_raw.json → ...ain/resources/chain_spec_mainnet_raw.json b/...bin/resources/chain_spec_mainnet_raw.json → ...ain/resources/chain_spec_mainnet_raw.json
diff --git a/...ain/bin/resources/chain_spec_testnet.json → blockchain/resources/chain_spec_testnet.json b/...ain/bin/resources/chain_spec_testnet.json → blockchain/resources/chain_spec_testnet.json
diff --git a/...bin/resources/chain_spec_testnet_raw.json → ...ain/resources/chain_spec_testnet_raw.json b/...bin/resources/chain_spec_testnet_raw.json → ...ain/resources/chain_spec_testnet_raw.json
diff --git a/blockchain/bin/resources/types.json → blockchain/resources/types.json b/blockchain/bin/resources/types.json → blockchain/resources/types.json