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

Jump to bottom

fix: adapt subgraph queries to new version of subgraph #332

Merged
merged 2 commits into from
Apr 30, 2024
Merged

fix: adapt subgraph queries to new version of subgraph #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10611e3
fix: addapt subgraph queries to new version of subgraph
josemarinas Apr 29, 2024
4e0414d
fix: tests
josemarinas Apr 29, 2024
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
5 changes: 5 additions & 0 deletions modules/client/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ TEMPLATE:
-->

## [UPCOMING]
## [1.23.2]

### Changed
- Update subgraph queries to version 1.4.2 of subgraph

## [1.23.1]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion modules/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aragon/sdk-client",
"author": "Aragon Association",
"version": "1.23.1",
"version": "1.23.2",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/sdk-client.esm.js",
Expand Down
14 changes: 9 additions & 5 deletions modules/client/src/multisig/internal/graphql-queries/proposal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ query MultisigProposal($proposalId: ID!) {
executed
approvalReached
isSignaling
approvers(first: 1000){
id
approvals(first: 1000){
approver{
address
}
}
}
}
Expand All @@ -48,14 +50,16 @@ query MultisigProposals($where: MultisigProposal_filter!, $limit:Int!, $skip: In
executed
approvalReached
isSignaling
approvals
approvalCount
startDate
endDate
executionDate
executionBlockNumber
creationBlockNumber
approvers {
id
approvals(first: 1000){
approver{
address
}
}
actions {
to
Expand Down
6 changes: 2 additions & 4 deletions modules/client/src/multisig/internal/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ export type SubgraphMultisigProposalBase = SubgraphProposalBase & {
plugin: SubgraphMultisigVotingSettings;
minApprovals: number;
approvalReached: boolean;
approvers: { id: string, approver: { address: string} }[];
// TODO change on subgraph fix
// approvers: SubgraphMultisigApproversListItem[];
approvals: SubgraphMultisigApproversListItem[];
};

export type SubgraphMultisigProposalListItem = SubgraphMultisigProposalBase;
Expand All @@ -20,7 +18,7 @@ export type SubgraphMultisigProposal = SubgraphMultisigProposalBase & {
};

export type SubgraphMultisigApproversListItem = {
approver: { id: string };
approver: { address: string };
};

export type SubgraphMultisigVotingSettings = {
Expand Down
4 changes: 2 additions & 2 deletions modules/client/src/multisig/internal/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function toMultisigProposal(
},
),
status: computeProposalStatus(proposal),
approvals: proposal.approvers.map(
approvals: proposal.approvals.map(
(a) => a.approver.address,
),
};
Expand All @@ -92,7 +92,7 @@ export function toMultisigProposalListItem(
title: metadata.title,
summary: metadata.summary,
},
approvals: proposal.approvers.map(
approvals: proposal.approvals.map(
(a) => a.approver.address,
),
actions: proposal.actions.map(
Expand Down
6 changes: 3 additions & 3 deletions modules/client/test/integration/multisig-client/methods.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ describe("Client Multisig", () => {
executionDate: Math.round(Date.now() / 1000).toString(),
executionBlockNumber: "50",
executionTxHash: TEST_TX_HASH,
approvers: [{ id: `${ADDRESS_ONE}_${ADDRESS_ONE}`, approver: {address: ADDRESS_ONE} }, { id: `${ADDRESS_TWO}_${ADDRESS_ONE}`, approver: {address: ADDRESS_TWO}}],
approvals: [{ approver: {address: ADDRESS_ONE} }, { approver: {address: ADDRESS_TWO}}],
minApprovals: 5,
plugin: {
onlyListed: true,
Expand Down Expand Up @@ -675,7 +675,7 @@ describe("Client Multisig", () => {
parseInt(subgraphProposal.executionBlockNumber),
);
expect(proposal.approvals).toMatchObject(
subgraphProposal.approvers.map((approver) => approver.approver.address),
subgraphProposal.approvals.map((approver) => approver.approver.address),
);
expect(proposal.settings.minApprovals).toBe(
subgraphProposal.plugin.minApprovals,
Expand Down Expand Up @@ -737,7 +737,7 @@ describe("Client Multisig", () => {
mockedClient.request.mockResolvedValueOnce({
multisigProposals: [{
...SUBGRAPH_PROPOSAL_BASE,
approvers: [{ id: `${ADDRESS_ONE}_${ADDRESS_ONE}`, approver: { address: ADDRESS_ONE } }, { id: `${ADDRESS_TWO}_${ADDRESS_ONE}`, approver: { address: ADDRESS_TWO } }],
approvals: [{ approver: { address: ADDRESS_ONE } }, { approver: { address: ADDRESS_TWO } }],
plugin: {
onlyListed: true,
},
Expand Down
Loading