Development chain with EVM and Ink contracts (#423)

* Development chain with EVM and Ink contracts * Fix code formatting * Added local chain properties
AstarNetwork · Sep 20, 2021 · b0dbe3a · b0dbe3a
1 parent 508f736
commit b0dbe3a
Show file tree

Hide file tree

Showing 23 changed files with 1,806 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "bin/collator",
+    "runtime/local",
     "runtime/shiden",
     "runtime/shibuya",
     "frame/block-reward",

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -22,6 +22,7 @@ futures = { version = "0.3.1", features = ["compat"] }
 structopt = { version = "0.3.8", optional = true }
 async-trait = "0.1.42"
 lazy_static = "1.4"
+serde_json = "1.0"
 log = "0.4.8"
 hex = "0.4"
 
@@ -47,7 +48,9 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "pol
 sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
 sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
@@ -74,6 +77,7 @@ pallet-evm = { git = "https://github.com/PlasmNetwork/frontier", branch = "polka
 pallet-ethereum = { git = "https://github.com/PlasmNetwork/frontier", branch = "polkadot-v0.9.9" }
 
 # astar-specific dependencies
+local-runtime = { path = "../../runtime/local" }
 shiden-runtime = { path = "../../runtime/shiden" }
 shibuya-runtime = { path = "../../runtime/shibuya" }
 
@@ -82,6 +86,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+pallet-contracts-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 
 # CLI-specific dependencies
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", optional = true }

diff --git a/bin/collator/src/.rpc.rs.swp b/bin/collator/src/.rpc.rs.swp
diff --git a/bin/collator/src/cli.rs b/bin/collator/src/cli.rs
@@ -142,7 +142,7 @@ impl RelayChainCli {
         para_config: &sc_service::Configuration,
         relay_chain_args: impl Iterator<Item = &'a String>,
     ) -> Self {
-        let extension = crate::chain_spec::Extensions::try_get(&*para_config.chain_spec);
+        let extension = crate::parachain::Extensions::try_get(&*para_config.chain_spec);
         let chain_id = extension.map(|e| e.relay_chain.clone());
         let base_path = para_config
             .base_path