Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a386393
improve membersURI
Rashmi-278 Feb 26, 2024
3e5bf86
add limit, pagination and uniqueness check for members
Rashmi-278 Mar 6, 2024
231b6b3
updated approach, get all unique addresses from DB
Rashmi-278 Apr 22, 2024
b828ed3
remove angle brackets from context link
Rashmi-278 Apr 22, 2024
51c4294
add context
Rashmi-278 Apr 22, 2024
7ebe8c7
Update .gitignore
Rashmi-278 May 1, 2024
ac8669b
Update src/eip4824.ts
Rashmi-278 May 1, 2024
9d41dd3
lint
Rashmi-278 May 1, 2024
47e6eb0
requested changes
Rashmi-278 May 1, 2024
a35202b
Merge remote changes into improve-membersURI
Rashmi-278 May 1, 2024
458e794
remove pnpm
Rashmi-278 May 2, 2024
9849c0b
optimize query for speedy retrival
Rashmi-278 Jun 17, 2024
e342770
Exclude known addresses to optimize for speed
Rashmi-278 Jun 17, 2024
252acc3
remove comments
Rashmi-278 Jun 17, 2024
1df3050
Update src/helpers/spaces.ts
Rashmi-278 Jun 18, 2024
1da8ee9
Update src/helpers/spaces.ts
Rashmi-278 Jun 18, 2024
b2c10b8
cursor conditional
Rashmi-278 Jul 1, 2024
0ce6028
Merge branch 'snapshot-labs:master' into improve-membersURI
Rashmi-278 Jul 1, 2024
240ed25
apply changes
Rashmi-278 Jul 1, 2024
1cd13f3
apply changes
Rashmi-278 Jul 1, 2024
ad86432
cursor conditions
Rashmi-278 Jul 1, 2024
3ca9efa
query improved
Rashmi-278 Aug 21, 2024
560a182
Merge branch 'master' into improve-membersURI
Rashmi-278 Aug 21, 2024
d285d3b
Merge branch 'snapshot-labs:master' into improve-membersURI
Rashmi-278 Aug 21, 2024
f96bf1d
Update eip4824.ts
Rashmi-278 Aug 21, 2024
84d905e
lint
Rashmi-278 Aug 21, 2024
51b90b6
bug fix sql injection
Rashmi-278 Feb 5, 2025
f052e0e
Merge branch 'master' into improve-membersURI
Rashmi-278 Feb 5, 2025
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
50 changes: 38 additions & 12 deletions src/eip4824.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import { getSpace } from './helpers/spaces';
import { getSpace, getUniqueVotersForSpace } from './helpers/spaces';
import db, { sequencerDB } from './helpers/mysql';

const router = express.Router();
Expand Down Expand Up @@ -35,28 +35,54 @@ router.get('/:space', async (req, res) => {

router.get('/:space/members', async (req, res) => {
let space: any = {};
let uniqueVotersResult: any = {};

try {
space = await getSpace(req.params.space);
const spaceId = req.params.space;
const cursor = req.query.cursor || null;
// Default pageSize is set to 100, this is the query limit.

space = await getSpace(spaceId);
if (!space.verified) return res.status(400).json({ error: 'INVALID' });

uniqueVotersResult = await getUniqueVotersForSpace(spaceId, cursor);
} catch (e) {
return res.status(404).json({ error: 'NOT_FOUND' });
}

const members = [...space.admins, ...space.moderators, ...space.members].map(
member => ({
type: 'EthereumAddress',
id: member
})
);

return res.json({
// Combine all members and map them to JSON strings for uniqueness check
const allMembersJSON = [
...space.admins.map(admin =>
JSON.stringify({ type: 'EthereumAddress', id: admin })
),
...space.moderators.map(moderator =>
JSON.stringify({ type: 'EthereumAddress', id: moderator })
),
...space.members.map(member =>
JSON.stringify({ type: 'EthereumAddress', id: member })
),
...uniqueVotersResult.voters.map(voter =>
JSON.stringify({ type: 'EthereumAddress', id: voter })
)
];

// Convert the array of JSON strings to a Set to remove duplicates, then back to an array
const uniqueMembersJSON = [...new Set(allMembersJSON)];

// Convert each JSON string back to an object
const members = uniqueMembersJSON.map(memberJSON => JSON.parse(memberJSON));

const responseObject = {
'@context': context,
type: 'DAO',
name: space.name,
members
});
members: members,
nextCursor: uniqueVotersResult.nextCursor
? uniqueVotersResult.nextCursor
: undefined
};

return res.json(responseObject);
});

router.get('/:space/proposals', async (req, res) => {
Expand Down
44 changes: 44 additions & 0 deletions src/helpers/spaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,50 @@ async function getVotes() {
return await db.queryAsync(query);
}

export async function getUniqueVotersForSpace(
spaceId,
cursor = null,
pageSize = 100
) {
let query, params;

// Adjust the query based on whether a cursor is provided
if (cursor) {
// Query to use when there is a cursor value, fetching results after the cursor
query = `
SELECT DISTINCT voter
FROM votes
WHERE space = ? AND voter > ?
ORDER BY voter
LIMIT ?
`;
params = [spaceId, cursor, pageSize];
} else {
// Query to use for the first page, without a cursor
query = `
SELECT DISTINCT voter
FROM votes
WHERE space = ?
ORDER BY voter
LIMIT ?
`;
params = [spaceId, pageSize];
}

const results = await db.queryAsync(query, params);

if (!results || results.length === 0)
return Promise.reject(new Error('NOT_FOUND'));

// As the results are ordered, the last voter ID can serve as the next cursor,
const nextCursor =
results.length === pageSize ? results[results.length - 1].voter : null;
return {
voters: results.map(row => row.voter),
nextCursor: nextCursor
};
}

async function getFollowers() {
const query = `
SELECT space, COUNT(id) as count,
Expand Down