From afcf672b6bdc59675927bed0fb9ad3c99625f6bd Mon Sep 17 00:00:00 2001 From: josemarinas <36479864+josemarinas@users.noreply.github.com> Date: Thu, 9 May 2024 12:56:18 +0200 Subject: [PATCH] chore: add metadataHash to response (#334) * chore: add metadataHash to response * chore: add metadataHash to response --- modules/client-common/CHANGELOG.md | 5 +++++ modules/client-common/package.json | 2 +- modules/client-common/src/types.ts | 2 ++ modules/client/CHANGELOG.md | 3 +++ modules/client/package.json | 4 ++-- modules/client/src/addresslistVoting/internal/utils.ts | 2 ++ modules/client/src/internal/utils.ts | 2 ++ modules/client/src/multisig/internal/utils.ts | 2 ++ modules/client/src/tokenVoting/internal/utils.ts | 2 ++ modules/client/src/types.ts | 2 ++ 10 files changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/client-common/CHANGELOG.md b/modules/client-common/CHANGELOG.md index 62b4a39e1..f919b4308 100644 --- a/modules/client-common/CHANGELOG.md +++ b/modules/client-common/CHANGELOG.md @@ -19,6 +19,11 @@ TEMPLATE: ## [UPCOMING] +- Added `metadataHash` field to proposal and dao objects. + +## [1.15.0] +- Added `metadataHash` field to proposal and dao objects. + ### Added - `getDefaultIpfsNodes` function to get the default IPFS nodes for a network diff --git a/modules/client-common/package.json b/modules/client-common/package.json index 3a4f14408..1f3e81495 100644 --- a/modules/client-common/package.json +++ b/modules/client-common/package.json @@ -1,7 +1,7 @@ { "name": "@aragon/sdk-client-common", "author": "Aragon Association", - "version": "1.15.1", + "version": "1.15.2", "license": "MIT", "main": "dist/index.js", "module": "dist/sdk-client-common.esm.js", diff --git a/modules/client-common/src/types.ts b/modules/client-common/src/types.ts index 96d9f504c..393dc4a5f 100644 --- a/modules/client-common/src/types.ts +++ b/modules/client-common/src/types.ts @@ -199,6 +199,7 @@ export type ProposalBase = { }; creatorAddress: string; metadata: ProposalMetadata; + metadataHash: string; startDate: Date; endDate: Date; creationDate: Date; @@ -219,6 +220,7 @@ export type ProposalListItemBase = { }; creatorAddress: string; metadata: ProposalMetadataSummary; + metadataHash: string; startDate: Date; endDate: Date; status: ProposalStatus; diff --git a/modules/client/CHANGELOG.md b/modules/client/CHANGELOG.md index c4a68e589..95329aed6 100644 --- a/modules/client/CHANGELOG.md +++ b/modules/client/CHANGELOG.md @@ -18,6 +18,9 @@ TEMPLATE: --> ## [UPCOMING] + +- Added `metadataHash` field to proposal and dao objects. + ## [1.23.2] ### Changed diff --git a/modules/client/package.json b/modules/client/package.json index 3fdca840b..1d796da51 100644 --- a/modules/client/package.json +++ b/modules/client/package.json @@ -1,7 +1,7 @@ { "name": "@aragon/sdk-client", "author": "Aragon Association", - "version": "1.23.3", + "version": "1.23.4", "license": "MIT", "main": "dist/index.js", "module": "dist/sdk-client.esm.js", @@ -69,7 +69,7 @@ "dependencies": { "@aragon/osx-commons-configs": "^0.4.0", "@aragon/osx-ethers": "1.3.0", - "@aragon/sdk-client-common": "^1.15.1", + "@aragon/sdk-client-common": "^1.15.2", "@aragon/sdk-ipfs": "^1.1.0", "@ethersproject/abstract-signer": "^5.5.0", "@ethersproject/bignumber": "^5.6.0", diff --git a/modules/client/src/addresslistVoting/internal/utils.ts b/modules/client/src/addresslistVoting/internal/utils.ts index b47218659..010ffeb4c 100644 --- a/modules/client/src/addresslistVoting/internal/utils.ts +++ b/modules/client/src/addresslistVoting/internal/utils.ts @@ -55,6 +55,7 @@ export function toAddresslistVotingProposal( resources: metadata.resources, media: metadata.media, }, + metadataHash: proposal.metadata, startDate, endDate, creationDate, @@ -118,6 +119,7 @@ export function toAddresslistVotingProposalListItem( title: metadata.title, summary: metadata.summary, }, + metadataHash: proposal.metadata, startDate, endDate, status: computeProposalStatus(proposal), diff --git a/modules/client/src/internal/utils.ts b/modules/client/src/internal/utils.ts index 6aae0f62f..a51112be4 100644 --- a/modules/client/src/internal/utils.ts +++ b/modules/client/src/internal/utils.ts @@ -140,6 +140,7 @@ export function toDaoDetails( avatar: metadata.avatar || undefined, links: metadata.links, }, + metadataHash: dao.metadata, creationDate: new Date(parseInt(dao.createdAt) * 1000), // TODO update when new subgraph schema is deployed // filter out plugins that are not applied @@ -176,6 +177,7 @@ export function toDaoListItem( description: metadata.description, avatar: metadata.avatar || undefined, }, + metadataHash: dao.metadata, plugins: dao.plugins.filter( (plugin) => plugin.appliedPreparation && plugin.appliedVersion && diff --git a/modules/client/src/multisig/internal/utils.ts b/modules/client/src/multisig/internal/utils.ts index 8cb96c0cb..6d0063e54 100644 --- a/modules/client/src/multisig/internal/utils.ts +++ b/modules/client/src/multisig/internal/utils.ts @@ -45,6 +45,7 @@ export function toMultisigProposal( resources: metadata.resources, media: metadata.media, }, + metadataHash: proposal.metadata, settings: { onlyListed: proposal.plugin.onlyListed, minApprovals: proposal.minApprovals, @@ -92,6 +93,7 @@ export function toMultisigProposalListItem( title: metadata.title, summary: metadata.summary, }, + metadataHash: proposal.metadata, approvals: proposal.approvals.map( (a) => a.approver.address, ), diff --git a/modules/client/src/tokenVoting/internal/utils.ts b/modules/client/src/tokenVoting/internal/utils.ts index dfa42552a..84f10ba31 100644 --- a/modules/client/src/tokenVoting/internal/utils.ts +++ b/modules/client/src/tokenVoting/internal/utils.ts @@ -78,6 +78,7 @@ export function toTokenVotingProposal( resources: metadata.resources, media: metadata.media, }, + metadataHash: proposal.metadata, startDate, endDate, creationDate, @@ -156,6 +157,7 @@ export function toTokenVotingProposalListItem( title: metadata.title, summary: metadata.summary, }, + metadataHash: proposal.metadata, totalVotingWeight: BigInt(proposal.totalVotingPower), startDate, endDate, diff --git a/modules/client/src/types.ts b/modules/client/src/types.ts index 5c1db5791..3fc13d87b 100644 --- a/modules/client/src/types.ts +++ b/modules/client/src/types.ts @@ -36,6 +36,7 @@ export type DaoDetails = { address: string; ensDomain: string; metadata: DaoMetadata; + metadataHash: string; creationDate: Date; plugins: InstalledPluginListItem[]; }; @@ -48,6 +49,7 @@ export type DaoListItem = { description: string; avatar?: string; }; + metadataHash: string; plugins: InstalledPluginListItem[]; };