From dea30101f6f4c77f42c418c4ad68b68bd0c9f08c Mon Sep 17 00:00:00 2001 From: Edwin Wang Date: Mon, 13 Sep 2021 13:24:40 +0800 Subject: [PATCH 1/2] change SALP multisig account --- runtime/bifrost/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 1a2511ef68..802fd65fe8 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -978,12 +978,13 @@ impl EnsureOrigin for EnsureConfirmAsMultiSig { fn try_origin(o: Origin) -> Result { Into::, Origin>>::into(o).and_then(|o| match o { - RawOrigin::Signed(who) => + RawOrigin::Signed(who) => { if who == ConfirmMuitiSigAccount::get() { Ok(who) } else { Err(Origin::from(Some(who))) - }, + } + } r => Err(Origin::from(r)), }) } @@ -1006,7 +1007,7 @@ parameter_types! { pub XcmWeight: XcmBaseWeight = XCM_WEIGHT.into(); pub ContributionWeight:XcmBaseWeight = 893125000.into(); pub AddProxyWeight:XcmBaseWeight = XCM_WEIGHT.into(); - pub ConfirmMuitiSigAccount: AccountId = hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(); + pub ConfirmMuitiSigAccount: AccountId = hex!["e4da05f08e89bf6c43260d96f26fffcfc7deae5b465da08669a9d008e64c2c63"].into(); pub RelaychainSovereignSubAccount: MultiLocation = create_x2_multilocation(Utility::derivative_account_id(ParachainInfo::get().into_account(), ParachainDerivedProxyAccountType::Salp as u16)); pub SalpTransactType: ParachainTransactType = ParachainTransactType::Xcm; pub SalpProxyType: ParachainTransactProxyType = ParachainTransactProxyType::Derived; From 25d7e73b70d4694b1a6598724e3ed094d807ffa6 Mon Sep 17 00:00:00 2001 From: Edwin Wang Date: Mon, 13 Sep 2021 13:30:47 +0800 Subject: [PATCH 2/2] cargo +nightly fmt --- runtime/bifrost/src/lib.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 802fd65fe8..123bdfa560 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -978,13 +978,12 @@ impl EnsureOrigin for EnsureConfirmAsMultiSig { fn try_origin(o: Origin) -> Result { Into::, Origin>>::into(o).and_then(|o| match o { - RawOrigin::Signed(who) => { + RawOrigin::Signed(who) => if who == ConfirmMuitiSigAccount::get() { Ok(who) } else { Err(Origin::from(Some(who))) - } - } + }, r => Err(Origin::from(r)), }) }