Skip to content

No proxy in collectives dao #1265

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

Merged
wliyongfeng merged 4 commits into from
Mar 8, 2026
Merged

No proxy in collectives dao #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f010060
No proxy in collectives Dao space
hyifeng Mar 5, 2026
87d23d2
Remove debug data
hyifeng Mar 5, 2026
1fe8b4d
feat: allow unused fields in proposal creation config
hyifeng Mar 5, 2026
6cf124e
Simplify
hyifeng Mar 5, 2026
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
1 change: 1 addition & 0 deletions backend/packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"lodash.flatten": "^4.4.0",
"lodash.isempty": "^4.4.0",
"lodash.isequal": "^4.5.0",
"lodash.ismatch": "^4.4.0",
"lodash.isnil": "^4.0.0",
"lodash.omit": "^4.5.0",
"lodash.uniq": "^4.5.0",
Expand Down
13 changes: 7 additions & 6 deletions backend/packages/backend/src/features/proposals/createProposal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const proposalService = require("../../services/proposal.service");
const { ChoiceType } = require("../../constants");
const isEmpty = require("lodash.isempty");
const { spaces: spaceServices } = require("../../spaces");
const { Accessibility } = require("../../consts/space");
const { Accessibility, SpaceType } = require("../../consts/space");
const { checkProposalContent } = require("./checkProposalContent");
const isEqual = require("lodash.isequal");
const isMatch = require("lodash.ismatch");
const pick = require("lodash/pick");
const { getLatestHeight } = require("../../services/chain.service");
const { strategies } = require("../../consts/voting");
Expand Down Expand Up @@ -85,9 +85,10 @@ async function checkSnapshotHeights(data) {
const { networksConfig, snapshotHeights } = data;

if (
networksConfig.accessibility === Accessibility.WHITELIST &&
networksConfig.strategies?.length === 1 &&
networksConfig.strategies[0] === strategies.onePersonOneVote
networksConfig.type === SpaceType.CollectivesDao ||
(networksConfig.accessibility === Accessibility.WHITELIST &&
networksConfig.strategies?.length === 1 &&
networksConfig.strategies[0] === strategies.onePersonOneVote)
) {
// We don't need snapshotHeights in this case
return;
Expand Down Expand Up @@ -155,7 +156,7 @@ function checkNetworkConfig(data) {
...pick(spaceService, ["quorum", "version"]),
};

if (!isEqual(networksConfig, spaceNetworksConfig)) {
if (!isMatch(networksConfig, spaceNetworksConfig)) {
throw new HttpError(400, {
networksConfig: [
"The proposal networks config is not matching the space config",
Expand Down
26 changes: 26 additions & 0 deletions backend/packages/backend/src/scripts/fix-collectives-dao-space-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
require("dotenv").config();

const { daoSpaces } = require("./spaces");
const { getSpaceCollection } = require("../mongo");

async function main() {
const col = await getSpaceCollection();
for (const item of daoSpaces) {
await col.updateOne(
{ id: item.id },
{
$set: item,
$unset: {
whitelist: "",
symbol: "",
decimals: "",
networks: "",
},
},
);
}
}

main()
.catch(console.error)
.finally(() => process.exit());
16 changes: 1 addition & 15 deletions backend/packages/backend/src/scripts/spaces/jamdao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const { Accessibility, SpaceType } = require("../../consts/space");
const { networks, strategies } = require("./consts");
const { strategies } = require("./consts");

const config = {
id: "jamdao",
name: "JAM DAO",
symbol: "DOT",
decimals: 10,
accessibility: Accessibility.WHITELIST,
type: SpaceType.CollectivesDao,
members: [
Expand All @@ -26,18 +24,6 @@ const config = {
"15R1pWegyu7AfMev8DBMT67qxYoJhA1v7BbA2nn7S2uJ5QDF", // JamBrains
"15fGrDWmFoaApnZXEw1Zg45zuCqpkbMS9YPzczeU9dHseUUu", // Fluffy Labs
],
networks: [
{
network: networks.polkadot,
ss58Format: 0,
assets: [
{
symbol: "DOT",
decimals: 10,
},
],
},
],
weightStrategy: [strategies.onePersonOneVote],
version: "4",
spaceIcon: "jamdao.svg",
Expand Down
16 changes: 1 addition & 15 deletions backend/packages/backend/src/scripts/spaces/permanence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const { Accessibility, SpaceType } = require("../../consts/space");
const { networks, strategies } = require("./consts");
const { strategies } = require("./consts");

const config = {
id: "permanence",
name: "Permanence DAO",
symbol: "DOT",
decimals: 10,
accessibility: Accessibility.WHITELIST,
type: SpaceType.CollectivesDao,
members: [
Expand All @@ -23,18 +21,6 @@ const config = {
"13znFMMjHyM2UvSewvaKMC2bLUcySRMzcM8BAMTzm1G2P5ju", // PERMANENCE DAO/GOV-PROXY
"12KtA8mtfsK1CyQb4utLiwG3ao22z77w2cM2GqnaL2RiDCoJ", // Flez
],
networks: [
{
network: networks.polkadot,
ss58Format: 0,
assets: [
{
symbol: "DOT",
decimals: 10,
},
],
},
],
weightStrategy: [strategies.onePersonOneVote],
version: "4",
spaceIcon: "permanence.svg",
Expand Down
16 changes: 1 addition & 15 deletions backend/packages/backend/src/scripts/spaces/truthdao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const { Accessibility, SpaceType } = require("../../consts/space");
const { networks, strategies } = require("./consts");
const { strategies } = require("./consts");

const config = {
id: "truthdao",
name: "Truth DAO",
symbol: "DOT",
decimals: 10,
accessibility: Accessibility.WHITELIST,
type: SpaceType.CollectivesDao,
members: [
Expand All @@ -17,18 +15,6 @@ const config = {
"14pa3BAYZLPvZfRDjWEfZXZWBVU45E67HUQEUxNCrdXGoata", // Tiny/Mimir
"14qwyVVvW4Tuhq4Fvt2AHZqhbCtGfVb8HUY2xM2PKrzKsmZT",
],
networks: [
{
network: networks.polkadot,
ss58Format: 0,
assets: [
{
symbol: "DOT",
decimals: 10,
},
],
},
],
weightStrategy: [strategies.onePersonOneVote],
version: "4",
spaceIcon: "truthdao.svg",
Expand Down
6 changes: 5 additions & 1 deletion backend/packages/backend/src/services/proposal.service/createWhitelistProposal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { SpaceType } = require("../../consts/space");
const { HttpError } = require("../../exc");
const { spaces: spaceServices } = require("../../spaces");
const { isSameAddress } = require("../../utils/address");
Expand Down Expand Up @@ -34,7 +35,10 @@ async function createWhitelistProposal({
const spaceService = spaceServices[space];
const weightStrategy = spaceService.weightStrategy;

if (realProposer && realProposer !== address) {
if (realProposer && !isSameAddress(realProposer, address)) {
if (networksConfig?.type === SpaceType.CollectivesDao) {
throw new HttpError(400, "Proxy is not allowed in collectives DAO");
}
const lastHeight = await getLatestHeight(proposerNetwork);
await checkProxy(proposerNetwork, address, realProposer, lastHeight);
}
Expand Down
6 changes: 5 additions & 1 deletion backend/packages/backend/src/services/proposal.service/vote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const { adaptBalance } = require("../../utils/balance");
const { getDemocracyDelegated } = require("../node.service/getDelegated");
const { findDelegationStrategies } = require("../../utils/delegation");
const { getSocietyMember } = require("../node.service/getSocietyMember");
const { Accessibility } = require("../../consts/space");
const { Accessibility, SpaceType } = require("../../consts/space");
const {
hasBalanceStrategy,
hasSocietyStrategy,
Expand Down Expand Up @@ -146,6 +146,10 @@ async function checkProxy({ proposal, voterNetwork, address, realVoter }) {
return;
}

if (proposal.networksConfig?.type === SpaceType.CollectivesDao) {
throw new HttpError(400, "Proxy is not allowed in collectives DAO");
}

const snapshotHeight = proposal.snapshotHeights?.[voterNetwork];
await _checkProxy(voterNetwork, address, realVoter, snapshotHeight);
}
Expand Down
5 changes: 5 additions & 0 deletions backend/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5380,6 +5380,11 @@ lodash.isequal@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==

lodash.ismatch@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==

lodash.isnil@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz#49e28cd559013458c814c5479d3c663a21bfaa6c"
Expand Down