Skip to content

Commit bddf1fa

Browse files
svyatoniksvyatonik
authored
remove messages pallet owner relay argument (#1728)
1 parent ef55226 commit bddf1fa

File tree

10 files changed

+0
-129
lines changed

10 files changed

+0
-129
lines changed

‎deployments/bridges/rialto-millau/dashboard/grafana/rialto-millau-maintenance-dashboard.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@
153153
"interval": "",
154154
"legendFormat": "With-Millau messages relay account balance",
155155
"refId": "B"
156-
},
157-
{
158-
"expr": "at_Rialto_relay_MillauMessagesPalletOwner_balance",
159-
"interval": "",
160-
"legendFormat": "With-Millau messages pallet owner account balance",
161-
"refId": "C"
162156
}
163157
],
164158
"thresholds": [
@@ -346,12 +340,6 @@
346340
"interval": "",
347341
"legendFormat": "With-Rialto messages relay account balance",
348342
"refId": "B"
349-
},
350-
{
351-
"expr": "at_Millau_relay_RialtoMessagesPalletOwner_balance",
352-
"interval": "",
353-
"legendFormat": "With-Rialto messages pallet owner account balance",
354-
"refId": "C"
355343
}
356344
],
357345
"thresholds": [

‎deployments/bridges/rialto-millau/entrypoints/relay-millau-rialto-entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ sleep 6
2424
--millau-host millau-node-alice \
2525
--millau-port 9944 \
2626
--millau-signer //Rialto.HeadersAndMessagesRelay \
27-
--millau-messages-pallet-owner=//Rialto.MessagesOwner \
2827
--millau-transactions-mortality=64 \
2928
--rialto-host rialto-node-alice \
3029
--rialto-port 9944 \
3130
--rialto-signer //Millau.HeadersAndMessagesRelay \
32-
--rialto-messages-pallet-owner=//Millau.MessagesOwner \
3331
--rialto-transactions-mortality=64 \
3432
--lane=00000000 \
3533
--lane=73776170 \

‎deployments/bridges/rialto-parachain-millau/dashboard/grafana/rialto-parachain-millau-maintenance-dashboard.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@
153153
"interval": "",
154154
"legendFormat": "With-Millau messages relay account balance",
155155
"refId": "B"
156-
},
157-
{
158-
"expr": "at_RialtoParachain_relay_MillauMessagesPalletOwner_balance{instance=\"relay-millau-rialto-parachain-1:9616\"}",
159-
"interval": "",
160-
"legendFormat": "With-Millau messages pallet owner account balance",
161-
"refId": "C"
162156
}
163157
],
164158
"thresholds": [
@@ -352,12 +346,6 @@
352346
"interval": "",
353347
"legendFormat": "With-Rialto parachains relay account balance",
354348
"refId": "C"
355-
},
356-
{
357-
"expr": "at_Millau_relay_RialtoParachainMessagesPalletOwner_balance{instance=\"relay-millau-rialto-parachain-1:9616\"}",
358-
"interval": "",
359-
"legendFormat": "With-RialtoParachain messages pallet owner account balance",
360-
"refId": "D"
361349
}
362350
],
363351
"thresholds": [

‎deployments/bridges/rialto-parachain-millau/entrypoints/relay-millau-rialto-parachain-entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ sleep 6
2828
--millau-host millau-node-alice \
2929
--millau-port 9944 \
3030
--millau-signer $MILLAU_RELAY_ACCOUNT \
31-
--millau-messages-pallet-owner=//RialtoParachain.MessagesOwner \
3231
--millau-transactions-mortality=64 \
3332
--rialto-parachain-host rialto-parachain-collator-charlie \
3433
--rialto-parachain-port 9944 \
3534
--rialto-parachain-signer $RIALTO_PARACHAIN_RELAY_ACCOUNT \
36-
--rialto-parachain-messages-pallet-owner=//Millau.MessagesOwner \
3735
--rialto-parachain-transactions-mortality=64 \
3836
--rialto-host rialto-node-alice \
3937
--rialto-port 9944 \

‎relays/bin-substrate/src/cli/chain_schema.rs

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
1717

18-
use sp_core::Pair;
1918
use structopt::StructOpt;
2019
use strum::{EnumString, EnumVariantNames};
2120

@@ -259,40 +258,6 @@ macro_rules! declare_chain_signing_params_cli_schema {
259258
};
260259
}
261260

262-
/// Create chain-specific set of messages pallet owner signing parameters.
263-
#[macro_export]
264-
macro_rules! declare_chain_messages_pallet_owner_signing_params_cli_schema {
265-
($chain:ident, $chain_prefix:ident) => {
266-
bp_runtime::paste::item! {
267-
#[doc = "Parameters required to sign transaction on behalf of owner of the messages pallet at " $chain "."]
268-
#[derive(StructOpt, Debug, PartialEq, Eq)]
269-
pub struct [<$chain MessagesPalletOwnerSigningParams>] {
270-
#[doc = "The SURI of secret key to use when transactions are submitted to the " $chain " node."]
271-
#[structopt(long)]
272-
pub [<$chain_prefix _messages_pallet_owner>]: Option<String>,
273-
#[doc = "The password for the SURI of secret key to use when transactions are submitted to the " $chain " node."]
274-
#[structopt(long)]
275-
pub [<$chain_prefix _messages_pallet_owner_password>]: Option<String>,
276-
}
277-
278-
#[allow(dead_code)]
279-
impl [<$chain MessagesPalletOwnerSigningParams>] {
280-
/// Parse signing params into chain-specific KeyPair.
281-
pub fn to_keypair<Chain: CliChain>(&self) -> anyhow::Result<Option<Chain::KeyPair>> {
282-
let [<$chain_prefix _messages_pallet_owner>] = match self.[<$chain_prefix _messages_pallet_owner>] {
283-
Some(ref messages_pallet_owner) => messages_pallet_owner,
284-
None => return Ok(None),
285-
};
286-
Chain::KeyPair::from_string(
287-
[<$chain_prefix _messages_pallet_owner>],
288-
self.[<$chain_prefix _messages_pallet_owner_password>].as_deref()
289-
).map_err(|e| anyhow::format_err!("{:?}", e)).map(Some)
290-
}
291-
}
292-
}
293-
};
294-
}
295-
296261
/// Create chain-specific set of configuration objects: connection parameters,
297262
/// signing parameters and bridge initialization parameters.
298263
#[macro_export]
@@ -301,10 +266,6 @@ macro_rules! declare_chain_cli_schema {
301266
$crate::declare_chain_runtime_version_params_cli_schema!($chain, $chain_prefix);
302267
$crate::declare_chain_connection_params_cli_schema!($chain, $chain_prefix);
303268
$crate::declare_chain_signing_params_cli_schema!($chain, $chain_prefix);
304-
$crate::declare_chain_messages_pallet_owner_signing_params_cli_schema!(
305-
$chain,
306-
$chain_prefix
307-
);
308269
};
309270
}
310271

‎relays/bin-substrate/src/cli/relay_headers_and_messages/mod.rs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ pub struct BridgeEndCommonParams<Chain: ChainWithTransactions + CliChain> {
125125
pub sign: AccountKeyPairOf<Chain>,
126126
/// Transactions mortality.
127127
pub transactions_mortality: Option<u32>,
128-
/// Account that "owns" messages pallet.
129-
pub messages_pallet_owner: Option<AccountKeyPairOf<Chain>>,
130128
/// Accounts, which balances are exposed as metrics by the relay process.
131129
pub accounts: Vec<TaggedAccount<AccountIdOf<Chain>>>,
132130
}
@@ -500,8 +498,6 @@ mod tests {
500498
"9944",
501499
"--millau-signer",
502500
"//Charlie",
503-
"--millau-messages-pallet-owner",
504-
"//RialtoMessagesOwner",
505501
"--millau-transactions-mortality",
506502
"64",
507503
"--rialto-host",
@@ -510,8 +506,6 @@ mod tests {
510506
"9944",
511507
"--rialto-signer",
512508
"//Charlie",
513-
"--rialto-messages-pallet-owner",
514-
"//MillauMessagesOwner",
515509
"--rialto-transactions-mortality",
516510
"64",
517511
"--lane",
@@ -555,10 +549,6 @@ mod tests {
555549
millau_signer_password_file: None,
556550
millau_transactions_mortality: Some(64),
557551
},
558-
left_messages_pallet_owner: MillauMessagesPalletOwnerSigningParams {
559-
millau_messages_pallet_owner: Some("//RialtoMessagesOwner".into()),
560-
millau_messages_pallet_owner_password: None,
561-
},
562552
left_headers_to_right_sign_override: MillauHeadersToRialtoSigningParams {
563553
millau_headers_to_rialto_signer: None,
564554
millau_headers_to_rialto_signer_password: None,
@@ -583,10 +573,6 @@ mod tests {
583573
rialto_signer_password_file: None,
584574
rialto_transactions_mortality: Some(64),
585575
},
586-
right_messages_pallet_owner: RialtoMessagesPalletOwnerSigningParams {
587-
rialto_messages_pallet_owner: Some("//MillauMessagesOwner".into()),
588-
rialto_messages_pallet_owner_password: None,
589-
},
590576
right_headers_to_left_sign_override: RialtoHeadersToMillauSigningParams {
591577
rialto_headers_to_millau_signer: None,
592578
rialto_headers_to_millau_signer_password: None,
@@ -612,8 +598,6 @@ mod tests {
612598
"//Iden",
613599
"--rialto-headers-to-millau-signer",
614600
"//Ken",
615-
"--millau-messages-pallet-owner",
616-
"//RialtoParachainMessagesOwner",
617601
"--millau-transactions-mortality",
618602
"64",
619603
"--rialto-parachain-host",
@@ -622,8 +606,6 @@ mod tests {
622606
"9944",
623607
"--rialto-parachain-signer",
624608
"//George",
625-
"--rialto-parachain-messages-pallet-owner",
626-
"//MillauMessagesOwner",
627609
"--rialto-parachain-transactions-mortality",
628610
"64",
629611
"--rialto-host",
@@ -667,10 +649,6 @@ mod tests {
667649
millau_signer_password_file: None,
668650
millau_transactions_mortality: Some(64),
669651
},
670-
left_messages_pallet_owner: MillauMessagesPalletOwnerSigningParams {
671-
millau_messages_pallet_owner: Some("//RialtoParachainMessagesOwner".into()),
672-
millau_messages_pallet_owner_password: None,
673-
},
674652
left_headers_to_right_sign_override:
675653
MillauHeadersToRialtoParachainSigningParams {
676654
millau_headers_to_rialto_parachain_signer: None,
@@ -696,12 +674,6 @@ mod tests {
696674
rialto_parachain_signer_password_file: None,
697675
rialto_parachain_transactions_mortality: Some(64),
698676
},
699-
right_messages_pallet_owner: RialtoParachainMessagesPalletOwnerSigningParams {
700-
rialto_parachain_messages_pallet_owner: Some(
701-
"//MillauMessagesOwner".into()
702-
),
703-
rialto_parachain_messages_pallet_owner_password: None,
704-
},
705677
right_relay_headers_to_left_sign_override: RialtoHeadersToMillauSigningParams {
706678
rialto_headers_to_millau_signer: Some("//Ken".into()),
707679
rialto_headers_to_millau_signer_password: None,

‎relays/bin-substrate/src/cli/relay_headers_and_messages/parachain_to_parachain.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
8989
// default signer, which is always used to sign messages relay transactions on the left chain
9090
#[structopt(flatten)]
9191
left_sign: [<$left_parachain SigningParams>],
92-
// signer used to sign parameter update transactions at the left parachain
93-
#[structopt(flatten)]
94-
left_messages_pallet_owner: [<$left_parachain MessagesPalletOwnerSigningParams>],
9592

9693
#[structopt(flatten)]
9794
right: [<$right_parachain ConnectionParams>],
@@ -101,9 +98,6 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
10198
// default signer, which is always used to sign messages relay transactions on the right chain
10299
#[structopt(flatten)]
103100
right_sign: [<$right_parachain SigningParams>],
104-
// signer used to sign parameter update transactions at the right parachain
105-
#[structopt(flatten)]
106-
right_messages_pallet_owner: [<$right_parachain MessagesPalletOwnerSigningParams>],
107101

108102
// override for right_relay->left-parachain headers signer
109103
#[structopt(flatten)]
@@ -142,14 +136,12 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
142136
client: self.left.into_client::<Left>().await?,
143137
sign: self.left_sign.to_keypair::<Left>()?,
144138
transactions_mortality: self.left_sign.transactions_mortality()?,
145-
messages_pallet_owner: self.left_messages_pallet_owner.to_keypair::<Left>()?,
146139
accounts: vec![],
147140
},
148141
BridgeEndCommonParams {
149142
client: self.right.into_client::<Right>().await?,
150143
sign: self.right_sign.to_keypair::<Right>()?,
151144
transactions_mortality: self.right_sign.transactions_mortality()?,
152-
messages_pallet_owner: self.right_messages_pallet_owner.to_keypair::<Right>()?,
153145
accounts: vec![],
154146
},
155147
)?,

‎relays/bin-substrate/src/cli/relay_headers_and_messages/relay_to_parachain.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
8383
// default signer, which is always used to sign messages relay transactions on the left chain
8484
#[structopt(flatten)]
8585
left_sign: [<$left_chain SigningParams>],
86-
// signer used to sign parameter update transactions at the left chain
87-
#[structopt(flatten)]
88-
left_messages_pallet_owner: [<$left_chain MessagesPalletOwnerSigningParams>],
8986

9087
#[structopt(flatten)]
9188
right: [<$right_parachain ConnectionParams>],
@@ -95,10 +92,6 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
9592
// default signer, which is always used to sign messages relay transactions on the right chain
9693
#[structopt(flatten)]
9794
right_sign: [<$right_parachain SigningParams>],
98-
// signer used to sign parameter update transactions at the left chain
99-
#[structopt(flatten)]
100-
right_messages_pallet_owner: [<$right_parachain MessagesPalletOwnerSigningParams>],
101-
10295

10396
// override for right_relay->left headers signer
10497
#[structopt(flatten)]
@@ -131,14 +124,12 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
131124
client: self.left.into_client::<Left>().await?,
132125
sign: self.left_sign.to_keypair::<Left>()?,
133126
transactions_mortality: self.left_sign.transactions_mortality()?,
134-
messages_pallet_owner: self.left_messages_pallet_owner.to_keypair::<Left>()?,
135127
accounts: vec![],
136128
},
137129
BridgeEndCommonParams {
138130
client: self.right.into_client::<Right>().await?,
139131
sign: self.right_sign.to_keypair::<Right>()?,
140132
transactions_mortality: self.right_sign.transactions_mortality()?,
141-
messages_pallet_owner: self.right_messages_pallet_owner.to_keypair::<Right>()?,
142133
accounts: vec![],
143134
},
144135
)?,

‎relays/bin-substrate/src/cli/relay_headers_and_messages/relay_to_relay.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ macro_rules! declare_relay_to_relay_bridge_schema {
6464
right_headers_to_left_sign_override: [<$right_chain HeadersTo $left_chain SigningParams>],
6565
#[structopt(flatten)]
6666
left_sign: [<$left_chain SigningParams>],
67-
#[structopt(flatten)]
68-
left_messages_pallet_owner: [<$left_chain MessagesPalletOwnerSigningParams>],
6967
// default signer, which is always used to sign messages relay transactions on the right chain
7068
#[structopt(flatten)]
7169
right: [<$right_chain ConnectionParams>],
@@ -74,8 +72,6 @@ macro_rules! declare_relay_to_relay_bridge_schema {
7472
left_headers_to_right_sign_override: [<$left_chain HeadersTo $right_chain SigningParams>],
7573
#[structopt(flatten)]
7674
right_sign: [<$right_chain SigningParams>],
77-
#[structopt(flatten)]
78-
right_messages_pallet_owner: [<$right_chain MessagesPalletOwnerSigningParams>],
7975
}
8076

8177
impl [<$left_chain $right_chain HeadersAndMessages>] {
@@ -94,14 +90,12 @@ macro_rules! declare_relay_to_relay_bridge_schema {
9490
client: self.left.into_client::<Left>().await?,
9591
sign: self.left_sign.to_keypair::<Left>()?,
9692
transactions_mortality: self.left_sign.transactions_mortality()?,
97-
messages_pallet_owner: self.left_messages_pallet_owner.to_keypair::<Left>()?,
9893
accounts: vec![],
9994
},
10095
BridgeEndCommonParams {
10196
client: self.right.into_client::<Right>().await?,
10297
sign: self.right_sign.to_keypair::<Right>()?,
10398
transactions_mortality: self.right_sign.transactions_mortality()?,
104-
messages_pallet_owner: self.right_messages_pallet_owner.to_keypair::<Right>()?,
10599
accounts: vec![],
106100
},
107101
)?,

‎relays/lib-substrate-relay/src/lib.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ pub enum TaggedAccount<AccountId> {
6363
/// Name of the bridged chain, which sends us messages or delivery confirmations.
6464
bridged_chain: String,
6565
},
66-
/// Account, used to sign messages with-bridged-chain pallet parameters update transactions.
67-
MessagesPalletOwner {
68-
/// Account id.
69-
id: AccountId,
70-
/// Name of the chain, bridged using messages pallet at our chain.
71-
bridged_chain: String,
72-
},
7366
}
7467

7568
impl<AccountId> TaggedAccount<AccountId> {
@@ -79,7 +72,6 @@ impl<AccountId> TaggedAccount<AccountId> {
7972
TaggedAccount::Headers { ref id, .. } => id,
8073
TaggedAccount::Parachains { ref id, .. } => id,
8174
TaggedAccount::Messages { ref id, .. } => id,
82-
TaggedAccount::MessagesPalletOwner { ref id, .. } => id,
8375
}
8476
}
8577

@@ -93,9 +85,6 @@ impl<AccountId> TaggedAccount<AccountId> {
9385
TaggedAccount::Messages { ref bridged_chain, .. } => {
9486
format!("{bridged_chain}Messages")
9587
},
96-
TaggedAccount::MessagesPalletOwner { ref bridged_chain, .. } => {
97-
format!("{bridged_chain}MessagesPalletOwner")
98-
},
9988
}
10089
}
10190
}

0 commit comments

Comments
 (0)