Skip to content

Commit b84d0e4

Browse files
svyatonikbkchr
svyatonik
authored and
bkchr
committed
Use same endowed accounts set on dev/local chains (#1244)
* use same accounts set on dev/local chains * run altruistic relayers in local demo scripts
1 parent 4cdd959 commit b84d0e4

File tree

2 files changed

+102
-102
lines changed

2 files changed

+102
-102
lines changed

‎bridges/bin/millau/node/src/chain_spec.rs‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,7 @@ impl Alternative {
8888
testnet_genesis(
8989
vec![get_authority_keys_from_seed("Alice")],
9090
get_account_id_from_seed::<sr25519::Public>("Alice"),
91-
vec![
92-
get_account_id_from_seed::<sr25519::Public>("Alice"),
93-
get_account_id_from_seed::<sr25519::Public>("Bob"),
94-
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
95-
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
96-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
97-
get_account_id_from_seed::<sr25519::Public>("Alice"),
98-
)),
99-
],
91+
endowed_accounts(),
10092
true,
10193
)
10294
},
@@ -120,48 +112,7 @@ impl Alternative {
120112
get_authority_keys_from_seed("Eve"),
121113
],
122114
get_account_id_from_seed::<sr25519::Public>("Alice"),
123-
vec![
124-
get_account_id_from_seed::<sr25519::Public>("Alice"),
125-
get_account_id_from_seed::<sr25519::Public>("Bob"),
126-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
127-
get_account_id_from_seed::<sr25519::Public>("Dave"),
128-
get_account_id_from_seed::<sr25519::Public>("Eve"),
129-
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
130-
get_account_id_from_seed::<sr25519::Public>("George"),
131-
get_account_id_from_seed::<sr25519::Public>("Harry"),
132-
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
133-
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
134-
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
135-
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
136-
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
137-
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
138-
get_account_id_from_seed::<sr25519::Public>("George//stash"),
139-
get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
140-
get_account_id_from_seed::<sr25519::Public>("RialtoMessagesOwner"),
141-
get_account_id_from_seed::<sr25519::Public>("WithRialtoTokenSwap"),
142-
pallet_bridge_messages::relayer_fund_account_id::<
143-
bp_millau::AccountId,
144-
bp_millau::AccountIdConverter,
145-
>(),
146-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
147-
get_account_id_from_seed::<sr25519::Public>("Alice"),
148-
)),
149-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
150-
get_account_id_from_seed::<sr25519::Public>("Bob"),
151-
)),
152-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
153-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
154-
)),
155-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
156-
get_account_id_from_seed::<sr25519::Public>("Dave"),
157-
)),
158-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
159-
get_account_id_from_seed::<sr25519::Public>("Eve"),
160-
)),
161-
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
162-
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
163-
)),
164-
],
115+
endowed_accounts(),
165116
true,
166117
)
167118
},
@@ -175,6 +126,55 @@ impl Alternative {
175126
}
176127
}
177128

129+
/// We're using the same set of endowed accounts on all Millau chains (dev/local) to make
130+
/// sure that all accounts, required for bridge to be functional (e.g. relayers fund account,
131+
/// accounts used by relayers in our test deployments, accounts used for demonstration
132+
/// purposes), are all available on these chains.
133+
fn endowed_accounts() -> Vec<AccountId> {
134+
vec![
135+
get_account_id_from_seed::<sr25519::Public>("Alice"),
136+
get_account_id_from_seed::<sr25519::Public>("Bob"),
137+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
138+
get_account_id_from_seed::<sr25519::Public>("Dave"),
139+
get_account_id_from_seed::<sr25519::Public>("Eve"),
140+
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
141+
get_account_id_from_seed::<sr25519::Public>("George"),
142+
get_account_id_from_seed::<sr25519::Public>("Harry"),
143+
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
144+
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
145+
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
146+
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
147+
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
148+
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
149+
get_account_id_from_seed::<sr25519::Public>("George//stash"),
150+
get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
151+
get_account_id_from_seed::<sr25519::Public>("RialtoMessagesOwner"),
152+
get_account_id_from_seed::<sr25519::Public>("WithRialtoTokenSwap"),
153+
pallet_bridge_messages::relayer_fund_account_id::<
154+
bp_millau::AccountId,
155+
bp_millau::AccountIdConverter,
156+
>(),
157+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
158+
get_account_id_from_seed::<sr25519::Public>("Alice"),
159+
)),
160+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
161+
get_account_id_from_seed::<sr25519::Public>("Bob"),
162+
)),
163+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
164+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
165+
)),
166+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
167+
get_account_id_from_seed::<sr25519::Public>("Dave"),
168+
)),
169+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
170+
get_account_id_from_seed::<sr25519::Public>("Eve"),
171+
)),
172+
derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
173+
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
174+
)),
175+
]
176+
}
177+
178178
fn session_keys(aura: AuraId, beefy: BeefyId, grandpa: GrandpaId) -> SessionKeys {
179179
SessionKeys { aura, beefy, grandpa }
180180
}

‎bridges/bin/rialto/node/src/chain_spec.rs‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,7 @@ impl Alternative {
9696
testnet_genesis(
9797
vec![get_authority_keys_from_seed("Alice")],
9898
get_account_id_from_seed::<sr25519::Public>("Alice"),
99-
vec![
100-
get_account_id_from_seed::<sr25519::Public>("Alice"),
101-
get_account_id_from_seed::<sr25519::Public>("Bob"),
102-
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
103-
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
104-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
105-
get_account_id_from_seed::<sr25519::Public>("Bob"),
106-
)),
107-
],
99+
endowed_accounts(),
108100
true,
109101
)
110102
},
@@ -128,48 +120,7 @@ impl Alternative {
128120
get_authority_keys_from_seed("Eve"),
129121
],
130122
get_account_id_from_seed::<sr25519::Public>("Alice"),
131-
vec![
132-
get_account_id_from_seed::<sr25519::Public>("Alice"),
133-
get_account_id_from_seed::<sr25519::Public>("Bob"),
134-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
135-
get_account_id_from_seed::<sr25519::Public>("Dave"),
136-
get_account_id_from_seed::<sr25519::Public>("Eve"),
137-
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
138-
get_account_id_from_seed::<sr25519::Public>("George"),
139-
get_account_id_from_seed::<sr25519::Public>("Harry"),
140-
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
141-
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
142-
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
143-
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
144-
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
145-
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
146-
get_account_id_from_seed::<sr25519::Public>("George//stash"),
147-
get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
148-
get_account_id_from_seed::<sr25519::Public>("MillauMessagesOwner"),
149-
get_account_id_from_seed::<sr25519::Public>("WithMillauTokenSwap"),
150-
pallet_bridge_messages::relayer_fund_account_id::<
151-
bp_rialto::AccountId,
152-
bp_rialto::AccountIdConverter,
153-
>(),
154-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
155-
get_account_id_from_seed::<sr25519::Public>("Alice"),
156-
)),
157-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
158-
get_account_id_from_seed::<sr25519::Public>("Bob"),
159-
)),
160-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
161-
get_account_id_from_seed::<sr25519::Public>("Charlie"),
162-
)),
163-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
164-
get_account_id_from_seed::<sr25519::Public>("Dave"),
165-
)),
166-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
167-
get_account_id_from_seed::<sr25519::Public>("Eve"),
168-
)),
169-
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
170-
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
171-
)),
172-
],
123+
endowed_accounts(),
173124
true,
174125
)
175126
},
@@ -183,6 +134,55 @@ impl Alternative {
183134
}
184135
}
185136

137+
/// We're using the same set of endowed accounts on all Millau chains (dev/local) to make
138+
/// sure that all accounts, required for bridge to be functional (e.g. relayers fund account,
139+
/// accounts used by relayers in our test deployments, accounts used for demonstration
140+
/// purposes), are all available on these chains.
141+
fn endowed_accounts() -> Vec<AccountId> {
142+
vec![
143+
get_account_id_from_seed::<sr25519::Public>("Alice"),
144+
get_account_id_from_seed::<sr25519::Public>("Bob"),
145+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
146+
get_account_id_from_seed::<sr25519::Public>("Dave"),
147+
get_account_id_from_seed::<sr25519::Public>("Eve"),
148+
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
149+
get_account_id_from_seed::<sr25519::Public>("George"),
150+
get_account_id_from_seed::<sr25519::Public>("Harry"),
151+
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
152+
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
153+
get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
154+
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
155+
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
156+
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
157+
get_account_id_from_seed::<sr25519::Public>("George//stash"),
158+
get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
159+
get_account_id_from_seed::<sr25519::Public>("MillauMessagesOwner"),
160+
get_account_id_from_seed::<sr25519::Public>("WithMillauTokenSwap"),
161+
pallet_bridge_messages::relayer_fund_account_id::<
162+
bp_rialto::AccountId,
163+
bp_rialto::AccountIdConverter,
164+
>(),
165+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
166+
get_account_id_from_seed::<sr25519::Public>("Alice"),
167+
)),
168+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
169+
get_account_id_from_seed::<sr25519::Public>("Bob"),
170+
)),
171+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
172+
get_account_id_from_seed::<sr25519::Public>("Charlie"),
173+
)),
174+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
175+
get_account_id_from_seed::<sr25519::Public>("Dave"),
176+
)),
177+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
178+
get_account_id_from_seed::<sr25519::Public>("Eve"),
179+
)),
180+
derive_account_from_millau_id(bp_runtime::SourceAccount::Account(
181+
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
182+
)),
183+
]
184+
}
185+
186186
fn session_keys(
187187
babe: BabeId,
188188
beefy: BeefyId,

0 commit comments

Comments
 (0)