Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NonTransfer proxy filter #3141

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Update NonTransfer proxy filter #3141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions runtime/moonbase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,6 @@ impl pallet_evm_precompile_proxy::EvmProxyCallFilter for ProxyType {
&& match PrecompileName::from_address(call.to.0) {
Some(
PrecompileName::AuthorMappingPrecompile
| PrecompileName::IdentityPrecompile
| PrecompileName::ParachainStakingPrecompile,
) => true,
Some(ref precompile) if is_governance_precompile(precompile) => true,
Expand Down Expand Up @@ -1023,26 +1022,28 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
fn filter(&self, c: &RuntimeCall) -> bool {
match self {
ProxyType::Any => true,
ProxyType::NonTransfer => {
matches!(
c,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..)
| RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..)
| RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Identity(..)
| RuntimeCall::Utility(..)
| RuntimeCall::Proxy(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
ProxyType::NonTransfer => match c {
RuntimeCall::Identity(
pallet_identity::Call::add_sub { .. } | pallet_identity::Call::set_subs { .. },
) => false,
call => {
matches!(
call,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..) | RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..) | RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Utility(..) | RuntimeCall::Proxy(..)
| RuntimeCall::Identity(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
},
ProxyType::Governance => matches!(
c,
RuntimeCall::Referenda(..)
Expand Down
42 changes: 22 additions & 20 deletions runtime/moonbeam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,26 +1020,28 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
fn filter(&self, c: &RuntimeCall) -> bool {
match self {
ProxyType::Any => true,
ProxyType::NonTransfer => {
matches!(
c,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..)
| RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..)
| RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Identity(..)
| RuntimeCall::Utility(..)
| RuntimeCall::Proxy(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
ProxyType::NonTransfer => match c {
RuntimeCall::Identity(
pallet_identity::Call::add_sub { .. } | pallet_identity::Call::set_subs { .. },
) => false,
call => {
matches!(
call,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..) | RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..) | RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Utility(..) | RuntimeCall::Proxy(..)
| RuntimeCall::Identity(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
},
ProxyType::Governance => matches!(
c,
RuntimeCall::Referenda(..)
Expand Down
42 changes: 22 additions & 20 deletions runtime/moonriver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,26 +1028,28 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
fn filter(&self, c: &RuntimeCall) -> bool {
match self {
ProxyType::Any => true,
ProxyType::NonTransfer => {
matches!(
c,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..)
| RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..)
| RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Identity(..)
| RuntimeCall::Utility(..)
| RuntimeCall::Proxy(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
ProxyType::NonTransfer => match c {
RuntimeCall::Identity(
pallet_identity::Call::add_sub { .. } | pallet_identity::Call::set_subs { .. },
) => false,
call => {
matches!(
call,
RuntimeCall::System(..)
| RuntimeCall::ParachainSystem(..)
| RuntimeCall::Timestamp(..) | RuntimeCall::ParachainStaking(..)
| RuntimeCall::Referenda(..) | RuntimeCall::Preimage(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::TreasuryCouncilCollective(..)
| RuntimeCall::OpenTechCommitteeCollective(..)
| RuntimeCall::Utility(..) | RuntimeCall::Proxy(..)
| RuntimeCall::Identity(..) | RuntimeCall::AuthorMapping(..)
| RuntimeCall::CrowdloanRewards(
pallet_crowdloan_rewards::Call::claim { .. }
)
)
}
},
ProxyType::Governance => matches!(
c,
RuntimeCall::Referenda(..)
Expand Down
65 changes: 65 additions & 0 deletions test/suites/dev/moonbase/test-proxy/test-proxy-identity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
import "@moonbeam-network/api-augment";
import { beforeEach, describeSuite, expect } from "@moonwall/cli";
import { GLMR, type KeyringPair, alith, generateKeyringPair } from "@moonwall/util";
import { BN, u8aToU8a } from "@polkadot/util";
import type { EventRecord } from "@polkadot/types/interfaces";
import type { ApiPromise } from "@polkadot/api";
import type { RegistryError } from "@polkadot/types-codec/types";

const getProxyErrors = (api: ApiPromise, events: EventRecord[]): RegistryError[] => {
return events
.filter(({ event }) => api.events.proxy.ProxyExecuted.is(event))
.map(({ event }) => {
const module = event.data["result"].toJSON()["err"]["module"];
return api.registry.findMetaError({
index: new BN(module.index),
error: u8aToU8a(module.error),
});
});
};

describeSuite({
id: "D013005",
Expand Down Expand Up @@ -137,6 +153,55 @@ describeSuite({
});
},
});

it({
id: "T03",
title: "Should fail when calling pallet_identity through a `NonTransfer` proxy",
test: async () => {
// Add Alith as NonTransfer Proxy of another account
const blockAdd = await context.createBlock(
context.polkadotJs().tx.proxy.addProxy(alith.address, "NonTransfer", 0).signAsync(signer)
);
expect(blockAdd.result?.successful).to.be.true;

let alithNonce = await context
.viem()
.getTransactionCount({ address: alith.address as `0x${string}` });
const blockExecute = await context.createBlock([
// Alith adds itself as sub account of another account using a proxy call,
// and reserves a deposit
await context
.polkadotJs()
.tx.proxy.proxy(
signer.address,
"NonTransfer",
context.polkadotJs().tx.identity.addSub(alith.address, { Raw: "test" })
)
.signAsync(alith, { nonce: alithNonce++ }),
// Another flavour of the call above, it does exactly the same thing.
await context
.polkadotJs()
.tx.proxy.proxy(
signer.address,
"NonTransfer",
context.polkadotJs().tx.identity.setSubs([[alith.address, { Raw: "test" }]])
)
.signAsync(alith, { nonce: alithNonce++ }),
]);
expect(blockExecute.result!.length).to.equal(2);
expect(blockExecute.result!.every(({ successful }) => successful)).to.be.true;
const errors = blockExecute.result!.flatMap(({ events }) =>
getProxyErrors(context.polkadotJs(), events)
);
expect(errors.length).to.equal(2);
// We expect the calls to fail, `ProxyType` filters these calls
// for `NonTransfer` proxy calls.
for (const error of errors) {
expect(error.docs[0]).to.equal("The origin filter prevent the call to be dispatched.");
expect(error.name).to.equal("CallFiltered");
}
},
});
},
});

Expand Down
Loading