diff --git a/packages/kusama/src/__snapshots__/kusama.staking.e2e.test.ts.snap b/packages/kusama/src/__snapshots__/kusama.staking.e2e.test.ts.snap index 2338ac5b4..6f605f59b 100644 --- a/packages/kusama/src/__snapshots__/kusama.staking.e2e.test.ts.snap +++ b/packages/kusama/src/__snapshots__/kusama.staking.e2e.test.ts.snap @@ -294,10 +294,7 @@ exports[`Kusama Staking > set invulnerables with bad origin > events when settin "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 28000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/collectivesPolkadot.polkadot.test.ts.snap b/packages/polkadot/src/__snapshots__/collectivesPolkadot.polkadot.test.ts.snap index de0c4c00a..d4f8e4783 100644 --- a/packages/polkadot/src/__snapshots__/collectivesPolkadot.polkadot.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/collectivesPolkadot.polkadot.test.ts.snap @@ -104,10 +104,7 @@ exports[`collectives & polkadot > Relay authorizes Collectives upgrade via Colle }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -115,7 +112,7 @@ exports[`collectives & polkadot > Relay authorizes Collectives upgrade via Colle ] `; -exports[`collectives & polkadot > Relay authorizes Collectives upgrade via Collectives > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`collectives & polkadot > Relay authorizes Collectives upgrade via Collectives > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -123,10 +120,7 @@ exports[`collectives & polkadot > Relay authorizes Collectives upgrade via Colle "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -314,10 +308,7 @@ exports[`collectives & polkadot > Relay authorizes upgrade for itself > events w }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -325,7 +316,7 @@ exports[`collectives & polkadot > Relay authorizes upgrade for itself > events w ] `; -exports[`collectives & polkadot > Relay authorizes upgrade for itself > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`collectives & polkadot > Relay authorizes upgrade for itself > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -333,10 +324,7 @@ exports[`collectives & polkadot > Relay authorizes upgrade for itself > events w "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/polkadot.assetHubPolkadot.collectivesPolkadot.test.ts.snap b/packages/polkadot/src/__snapshots__/polkadot.assetHubPolkadot.collectivesPolkadot.test.ts.snap index 838776e88..06a622e14 100644 --- a/packages/polkadot/src/__snapshots__/polkadot.assetHubPolkadot.collectivesPolkadot.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/polkadot.assetHubPolkadot.collectivesPolkadot.test.ts.snap @@ -104,10 +104,7 @@ exports[`polkadot & asset hub & collectives > Relay authorizes AssetHub upgrade }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -115,7 +112,7 @@ exports[`polkadot & asset hub & collectives > Relay authorizes AssetHub upgrade ] `; -exports[`polkadot & asset hub & collectives > Relay authorizes AssetHub upgrade via Collectives > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`polkadot & asset hub & collectives > Relay authorizes AssetHub upgrade via Collectives > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -123,10 +120,7 @@ exports[`polkadot & asset hub & collectives > Relay authorizes AssetHub upgrade "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/polkadot.bridgeHubPolkadot.collectivesPolkadot.test.ts.snap b/packages/polkadot/src/__snapshots__/polkadot.bridgeHubPolkadot.collectivesPolkadot.test.ts.snap index da41ac8aa..006a5e99f 100644 --- a/packages/polkadot/src/__snapshots__/polkadot.bridgeHubPolkadot.collectivesPolkadot.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/polkadot.bridgeHubPolkadot.collectivesPolkadot.test.ts.snap @@ -104,10 +104,7 @@ exports[`polkadot & bridgeHub & collectives > Relay authorizes Bridge Hub upgrad }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -115,7 +112,7 @@ exports[`polkadot & bridgeHub & collectives > Relay authorizes Bridge Hub upgrad ] `; -exports[`polkadot & bridgeHub & collectives > Relay authorizes Bridge Hub upgrade via Collectives > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`polkadot & bridgeHub & collectives > Relay authorizes Bridge Hub upgrade via Collectives > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -123,10 +120,7 @@ exports[`polkadot & bridgeHub & collectives > Relay authorizes Bridge Hub upgrad "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/polkadot.coretimePolkadot.collectivesPolkadot.test.ts.snap b/packages/polkadot/src/__snapshots__/polkadot.coretimePolkadot.collectivesPolkadot.test.ts.snap index 57ac7461b..9583d1294 100644 --- a/packages/polkadot/src/__snapshots__/polkadot.coretimePolkadot.collectivesPolkadot.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/polkadot.coretimePolkadot.collectivesPolkadot.test.ts.snap @@ -104,10 +104,7 @@ exports[`polkadot & coretime & collectives > Relay authorizes Coretime upgrade v }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -115,7 +112,7 @@ exports[`polkadot & coretime & collectives > Relay authorizes Coretime upgrade v ] `; -exports[`polkadot & coretime & collectives > Relay authorizes Coretime upgrade via Collectives > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`polkadot & coretime & collectives > Relay authorizes Coretime upgrade via Collectives > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -123,10 +120,7 @@ exports[`polkadot & coretime & collectives > Relay authorizes Coretime upgrade v "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/polkadot.peoplePolkadot.collectivesPolkadot.test.ts.snap b/packages/polkadot/src/__snapshots__/polkadot.peoplePolkadot.collectivesPolkadot.test.ts.snap index 292fd6e84..519d96001 100644 --- a/packages/polkadot/src/__snapshots__/polkadot.peoplePolkadot.collectivesPolkadot.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/polkadot.peoplePolkadot.collectivesPolkadot.test.ts.snap @@ -104,10 +104,7 @@ exports[`polkadot & people & collectives > Relay authorizes People upgrade via C }, }, }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", @@ -115,7 +112,7 @@ exports[`polkadot & people & collectives > Relay authorizes People upgrade via C ] `; -exports[`polkadot & people & collectives > Relay authorizes People upgrade via Collectives > events when dispatching whitelisted call wtih bad origin 1`] = ` +exports[`polkadot & people & collectives > Relay authorizes People upgrade via Collectives > events when dispatching whitelisted call with bad origin 1`] = ` [ { "data": { @@ -123,10 +120,7 @@ exports[`polkadot & people & collectives > Relay authorizes People upgrade via C "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/polkadot/src/__snapshots__/polkadot.staking.e2e.test.ts.snap b/packages/polkadot/src/__snapshots__/polkadot.staking.e2e.test.ts.snap index f8fdf3e98..d998576e0 100644 --- a/packages/polkadot/src/__snapshots__/polkadot.staking.e2e.test.ts.snap +++ b/packages/polkadot/src/__snapshots__/polkadot.staking.e2e.test.ts.snap @@ -294,10 +294,7 @@ exports[`Polkadot Staking > set invulnerables with bad origin > events when sett "result": { "Err": "BadOrigin", }, - "task": [ - "(rounded 26000000)", - 0, - ], + "task": "(redacted)", }, "method": "Dispatched", "section": "scheduler", diff --git a/packages/shared/src/staking.ts b/packages/shared/src/staking.ts index 54dd467b2..465989fc9 100644 --- a/packages/shared/src/staking.ts +++ b/packages/shared/src/staking.ts @@ -101,7 +101,8 @@ async function locateEraChange(client: Client): Promise | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) // 1e7 is 1% commission const validateTx = client.api.tx.staking.validate({ commission: 1e7, blocked: false }) await sendTransaction(validateTx.signAsync(defaultAccountsSr25519.alice)) @@ -134,7 +135,8 @@ async function validateNoBondedFundsFailureTest< async function nominateNoBondedFundsFailureTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) // The empty list of targets is only checked *after* the extrinsic's origin, as it should, // so anything can be given here. const nominateTx = client.api.tx.staking.nominate([defaultAccountsSr25519.alice.address]) @@ -182,7 +184,8 @@ async function nominateNoBondedFundsFailureTest< async function stakingLifecycleTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client, addressEncoding: number) { +>(chain: Chain, addressEncoding: number) { + const [client] = await setupNetworks(chain) /// /// Generate validators, and fund them. /// @@ -414,7 +417,8 @@ async function stakingLifecycleTest< async function forceUnstakeTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice const bob = defaultAccountsSr25519.bob @@ -490,7 +494,8 @@ async function forceUnstakeTest< async function fastUnstakeTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client, addressEncoding: number) { +>(chain: Chain, addressEncoding: number) { + const [client] = await setupNetworks(chain) const kr = defaultAccountsSr25519 const alice = kr.alice const bob = kr.bob @@ -568,7 +573,8 @@ async function fastUnstakeTest< async function setMinCommission< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice await client.dev.setStorage({ @@ -653,7 +659,8 @@ async function setMinCommission< async function setStakingConfigsTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice await client.dev.setStorage({ @@ -768,7 +775,8 @@ async function setStakingConfigsTest< async function forceApplyValidatorCommissionTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) /// Create some Sr25519 accounts and fund them const alice = defaultAccountsSr25519.alice @@ -855,7 +863,8 @@ async function forceApplyValidatorCommissionTest< async function modifyValidatorCountTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice await client.dev.setStorage({ @@ -972,7 +981,8 @@ async function modifyValidatorCountTest< async function chillOtherTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) /// Rquired information for this test, to set appropriate thresholds later const minNominatorBond = await client.api.query.staking.minNominatorBond() @@ -1145,7 +1155,8 @@ async function chillOtherTest< async function unappliedSlashTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice const bob = defaultAccountsSr25519.bob const charlie = defaultAccountsSr25519.charlie @@ -1281,7 +1292,8 @@ async function unappliedSlashTest< async function cancelDeferredSlashTest< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client, origin: any) { +>(chain: Chain, origin: any) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice const bob = defaultAccountsSr25519.bob const charlie = defaultAccountsSr25519.charlie @@ -1410,7 +1422,8 @@ async function cancelDeferredSlashTest< async function cancelDeferredSlashTestBadOrigin< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice const cancelDeferredSlashTx = client.api.tx.staking.cancelDeferredSlash(0, [0]) @@ -1453,8 +1466,8 @@ async function cancelDeferredSlashTestBadOrigin< async function cancelDeferredSlashTestAsRoot< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { - await cancelDeferredSlashTest(client, { system: 'Root' }) +>(chain: Chain) { + await cancelDeferredSlashTest(chain, { system: 'Root' }) } /** @@ -1473,8 +1486,8 @@ async function cancelDeferredSlashTestAsRoot< async function cancelDeferredSlashTestAsAdmin< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { - await cancelDeferredSlashTest(client, { Origins: 'StakingAdmin' }) +>(chain: Chain) { + await cancelDeferredSlashTest(chain, { Origins: 'StakingAdmin' }) } /** @@ -1483,7 +1496,8 @@ async function cancelDeferredSlashTestAsAdmin< async function setInvulnerablesTestBadOrigin< TCustom extends Record | undefined, TInitStorages extends Record> | undefined, ->(client: Client) { +>(chain: Chain) { + const [client] = await setupNetworks(chain) const alice = defaultAccountsSr25519.alice const setInvulnerablesTx = client.api.tx.staking.setInvulnerables([alice.address]) @@ -1513,9 +1527,9 @@ async function setInvulnerablesTestBadOrigin< await client.dev.newBlock() - await checkSystemEvents(client, 'scheduler').toMatchSnapshot( - 'events when setting invulnerables with bad staking admin origin', - ) + await checkSystemEvents(client, 'scheduler') + .redact({ redactKeys: /task/ }) + .toMatchSnapshot('events when setting invulnerables with bad staking admin origin') events = await client.api.query.system.events() @@ -1539,66 +1553,64 @@ export function stakingE2ETests< TInitStorages extends Record> | undefined, >(chain: Chain, testConfig: { testSuiteName: string; addressEncoding: number }) { describe(testConfig.testSuiteName, async () => { - const [client] = await setupNetworks(chain) - test('trying to become a validator with no bonded funds fails', async () => { - await validateNoBondedFundsFailureTest(client) + await validateNoBondedFundsFailureTest(chain) }) test('trying to nominate with no bonded funds fails', async () => { - await nominateNoBondedFundsFailureTest(client) + await nominateNoBondedFundsFailureTest(chain) }) test('staking lifecycle', async () => { - await stakingLifecycleTest(client, testConfig.addressEncoding) + await stakingLifecycleTest(chain, testConfig.addressEncoding) }) test('test force unstaking of nominator', async () => { - await forceUnstakeTest(client) + await forceUnstakeTest(chain) }) test('test fast unstake', async () => { - await fastUnstakeTest(client, testConfig.addressEncoding) + await fastUnstakeTest(chain, testConfig.addressEncoding) }) test('set minimum validator commission', async () => { - await setMinCommission(client) + await setMinCommission(chain) }) test('set staking configs', async () => { - await setStakingConfigsTest(client) + await setStakingConfigsTest(chain) }) test('force apply validator commission', async () => { - await forceApplyValidatorCommissionTest(client) + await forceApplyValidatorCommissionTest(chain) }) test('modify validator count', async () => { - await modifyValidatorCountTest(client) + await modifyValidatorCountTest(chain) }) test('chill other', async () => { - await chillOtherTest(client) + await chillOtherTest(chain) }) test('unapplied slash', async () => { - await unappliedSlashTest(client) + await unappliedSlashTest(chain) }) test('cancel deferred slash with bad origin', async () => { - await cancelDeferredSlashTestBadOrigin(client) + await cancelDeferredSlashTestBadOrigin(chain) }) test('cancel deferred slash as root', async () => { - await cancelDeferredSlashTestAsRoot(client) + await cancelDeferredSlashTestAsRoot(chain) }) test('cancel deferred slash as admin', async () => { - await cancelDeferredSlashTestAsAdmin(client) + await cancelDeferredSlashTestAsAdmin(chain) }) test('set invulnerables with bad origin', async () => { - await setInvulnerablesTestBadOrigin(client) + await setInvulnerablesTestBadOrigin(chain) }) }) } diff --git a/packages/shared/src/upgrade.ts b/packages/shared/src/upgrade.ts index 91875eb11..001207312 100644 --- a/packages/shared/src/upgrade.ts +++ b/packages/shared/src/upgrade.ts @@ -106,7 +106,7 @@ export async function authorizeUpgradeViaCollectives( await scheduleInlineCallWithOrigin(governingChain, whiteListCall.method.toHex(), okOrigin) await governingChain.dev.newBlock() await checkSystemEvents(governingChain, 'scheduler') - .redact({ hash: false }) + .redact({ hash: false, redactKeys: /task/ }) .toMatchSnapshot('events when dispatching non-whitelisted call') await assertAuthorizedUpgradeUnchanged() @@ -128,8 +128,8 @@ export async function authorizeUpgradeViaCollectives( await scheduleInlineCallWithOrigin(governingChain, whiteListCall.method.toHex(), badOrigin) await governingChain.dev.newBlock() await checkSystemEvents(governingChain, 'scheduler') - .redact({ hash: false }) - .toMatchSnapshot('events when dispatching whitelisted call wtih bad origin') + .redact({ hash: false, redactKeys: /task/ }) + .toMatchSnapshot('events when dispatching whitelisted call with bad origin') await assertAuthorizedUpgradeUnchanged() // call is whitelisted, origin is ok - success expected