Merge branch 'master' into gav-xcm-v3

This commit is contained in:
Keith Yeung
2022-03-10 20:31:13 -08:00
40 changed files with 332 additions and 329 deletions
+1 -1
View File
@@ -90,4 +90,4 @@ runtime-benchmarks = [
"parachain-template-runtime/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
]
try-runtime = ["parachain-template-runtime/try-runtime"]
try-runtime = ["parachain-template-runtime/try-runtime"]
+1 -1
View File
@@ -275,7 +275,7 @@ pub fn run() -> Result<()> {
let id = ParaId::from(para_id);
let parachain_account =
AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);
AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account(&id);
let state_version =
RelayChainCli::native_runtime_version(&config.chain_spec).state_version();