From 82b93dd172a9239438b08c83ae152363b437a1c4 Mon Sep 17 00:00:00 2001 From: Sepehr Sanaei <46657145+sepehr2github@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:35:40 +0330 Subject: [PATCH] Pumped SDK to V1.16.2 (#1087) --- package.json | 2 +- src/context/createProposal.tsx | 2 +- src/hooks/useDaoDetails.tsx | 2 +- src/hooks/useUpdateVerification.tsx | 11 +--- .../aragon-sdk/queries/use-members.ts | 4 +- src/utils/library.ts | 3 +- yarn.lock | 64 ++++++++++++------- 7 files changed, 52 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index e182e268a..6af2b8bbf 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dependencies": { "@apollo/client": "^3.5.8", "@aragon/ods": "^1.0.1", - "@aragon/sdk-client": "^1.14.0", + "@aragon/sdk-client": "^1.16.2", "@elastic/apm-rum-react": "^2.0.0", "@radix-ui/react-accordion": "^1.1.2", "@radix-ui/react-dialog": "^1.0.4", diff --git a/src/context/createProposal.tsx b/src/context/createProposal.tsx index c5e595e37..671578aae 100644 --- a/src/context/createProposal.tsx +++ b/src/context/createProposal.tsx @@ -15,8 +15,8 @@ import { ProposalMetadata, ProposalStatus, TokenType, + hexToBytes, } from '@aragon/sdk-client-common'; -import {hexToBytes} from '@aragon/sdk-common'; import {useQueryClient} from '@tanstack/react-query'; import differenceInSeconds from 'date-fns/differenceInSeconds'; import {ethers} from 'ethers'; diff --git a/src/hooks/useDaoDetails.tsx b/src/hooks/useDaoDetails.tsx index acf6b1502..664fceb4f 100644 --- a/src/hooks/useDaoDetails.tsx +++ b/src/hooks/useDaoDetails.tsx @@ -11,7 +11,7 @@ import {CHAIN_METADATA} from 'utils/constants'; import {toDisplayEns} from 'utils/library'; import {NotFound} from 'utils/paths'; import {useClient} from './useClient'; -import {resolveIpfsCid} from '@aragon/sdk-common'; +import {resolveIpfsCid} from '@aragon/sdk-client-common'; /** * Fetches DAO data for a given DAO address or ENS name using a given client. diff --git a/src/hooks/useUpdateVerification.tsx b/src/hooks/useUpdateVerification.tsx index 13df1aa19..eac13b9fa 100644 --- a/src/hooks/useUpdateVerification.tsx +++ b/src/hooks/useUpdateVerification.tsx @@ -1,5 +1,4 @@ import {useQueries} from '@tanstack/react-query'; -import {useClient} from './useClient'; import {ProposalId} from 'utils/types'; /** @@ -8,22 +7,16 @@ import {ProposalId} from 'utils/types'; * @returns an arrea of queries the indicates the status of verifications */ export function useUpdateVerification(proposalId: ProposalId | string) { - const {client} = useClient(); - const verificationQueries = [ { queryKey: ['isPluginUpdateProposalValid', proposalId], - queryFn: () => - client?.methods.isPluginUpdateProposalValid(proposalId as string), + queryFn: () => Promise.resolve(() => null), enabled: Boolean(proposalId), retry: false, }, { queryKey: ['isDaoUpdateProposalValid', proposalId], - queryFn: () => - client?.methods.isDaoUpdateProposalValid({ - proposalId: proposalId as string, - }), + queryFn: () => Promise.resolve(() => null), enabled: Boolean(proposalId), retry: false, }, diff --git a/src/services/aragon-sdk/queries/use-members.ts b/src/services/aragon-sdk/queries/use-members.ts index ba0469bd8..1610a8ed4 100644 --- a/src/services/aragon-sdk/queries/use-members.ts +++ b/src/services/aragon-sdk/queries/use-members.ts @@ -14,7 +14,9 @@ const fetchMembers = async ( client?: TokenVotingClient | MultisigClient ): Promise> => { invariant(client != null, 'fetchMembers: client is not defined'); - const data = await client.methods.getMembers(params.pluginAddress); + const data = await client.methods.getMembers({ + pluginAddress: params.pluginAddress, + }); return data; }; diff --git a/src/utils/library.ts b/src/utils/library.ts index 196b826e4..92c94c840 100644 --- a/src/utils/library.ts +++ b/src/utils/library.ts @@ -12,8 +12,9 @@ import { import { DaoAction, SupportedNetwork as SdkSupportedNetworks, + bytesToHex, + resolveIpfsCid, } from '@aragon/sdk-client-common'; -import {bytesToHex, resolveIpfsCid} from '@aragon/sdk-common'; import {fetchEnsAvatar} from '@wagmi/core'; import {BigNumber, BigNumberish, constants, providers} from 'ethers'; import { diff --git a/yarn.lock b/yarn.lock index 789c014d5..b822559c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -66,21 +66,20 @@ dependencies: ethers "^5.6.2" -"@aragon/osx-ethers@1.3.0-rc0.2", "@aragon/osx-ethers@^1.3.0-rc0.2": - version "1.3.0-rc0.2" - resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.3.0-rc0.2.tgz#820f325ee8514bc6e598135bba2501f124d92d31" - integrity sha512-PpsmyZOBRQPElEsiLNkoGg/4j+oJn8SJC6S0oN837k5JofkleLbOdZgUmB0SHmL98hvcE157MoRZ4YM+IXbhhA== +"@aragon/osx-ethers@1.3.0-rc0.3", "@aragon/osx-ethers@^1.3.0-rc0.3": + version "1.3.0-rc0.3" + resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.3.0-rc0.3.tgz#53c7ee2888e25704932e4450c1518014cb383093" + integrity sha512-8hjNtAni7rGygtZDScJuCUh0QnA5q6gF8zhQycyhCvvjwakxWouLFEySpBPIYoFsMziqFa4E2uu/XyNHQb+YiQ== dependencies: ethers "^5.6.2" -"@aragon/sdk-client-common@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@aragon/sdk-client-common/-/sdk-client-common-1.6.0.tgz#02d7f65a5f83e40d3f430052824e1c16bc460e9e" - integrity sha512-Rb4+PM4cIXM1eBvxdnNcAtpQMKlwATpVsebJT0ODKVqmVy3gR8i8aiKZJWDxx0dxOn2S7FlocTdOOXyXAVCA0Q== +"@aragon/sdk-client-common@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@aragon/sdk-client-common/-/sdk-client-common-1.7.1.tgz#1d27cadd5a56591c37581295d899ae429c9a89b8" + integrity sha512-0kRFeQSgLeIO6Vh7FJ3YYRqjecSAXGrLsDdpTAFbtPlbeZgxc8T10WmPMFooaU3Eyv5TtIDrg8C5k+ytXhdpVA== dependencies: - "@aragon/osx-ethers" "^1.3.0-rc0.2" + "@aragon/osx-ethers" "^1.3.0-rc0.3" "@aragon/osx-ethers-v1.0.0" "npm:@aragon/osx-ethers@1.2.1" - "@aragon/sdk-common" "^1.7.0" "@aragon/sdk-ipfs" "^1.1.0" "@ethersproject/abstract-signer" "^5.5.0" "@ethersproject/bignumber" "^5.6.0" @@ -90,15 +89,15 @@ "@ethersproject/wallet" "^5.6.0" graphql "^16.5.0" graphql-request "^4.3.0" + yup "^1.2.0" -"@aragon/sdk-client@^1.14.0": - version "1.14.0" - resolved "https://registry.yarnpkg.com/@aragon/sdk-client/-/sdk-client-1.14.0.tgz#994052955d4bad5ad51d637e12634c67127ca8be" - integrity sha512-6nEPNoCO4SuIbj2CoM3dRaZw6yaBLH3yUUubCc3ynWYPdHMK6aeUhu5Q+GOLM5g6x+utPtGx5eUv9ydsqGS0MQ== +"@aragon/sdk-client@^1.16.2": + version "1.16.2" + resolved "https://registry.yarnpkg.com/@aragon/sdk-client/-/sdk-client-1.16.2.tgz#509ba630bd37710576b5dd7034af230761a3e9cf" + integrity sha512-doN2tmBuJcNH85PYYKq6KsyRAmdAfXSe1JnmyUhY7AYY+nYH2GFG6U8sNiEBGfxOnt6DCf0ChNX4fzfWh1iUWw== dependencies: - "@aragon/osx-ethers" "1.3.0-rc0.2" - "@aragon/sdk-client-common" "^1.6.0" - "@aragon/sdk-common" "^1.7.0" + "@aragon/osx-ethers" "1.3.0-rc0.3" + "@aragon/sdk-client-common" "^1.7.1" "@aragon/sdk-ipfs" "^1.1.0" "@ethersproject/abstract-signer" "^5.5.0" "@ethersproject/bignumber" "^5.6.0" @@ -110,11 +109,7 @@ "@openzeppelin/contracts-upgradeable" "^4.8.1" graphql "^16.5.0" graphql-request "^4.3.0" - -"@aragon/sdk-common@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@aragon/sdk-common/-/sdk-common-1.7.0.tgz#7e71617aec584ff241ff4c7a0d0e73303f169539" - integrity sha512-Op5c52Qn6MdNdPu+ZJDj9ai1Leur+VpVebaGE3HaZMPYE34IPXblmM10YU05H9Znf5g6jvIDLRB8xQmUOTFscw== + yup "^1.2.0" "@aragon/sdk-ipfs@^1.1.0": version "1.1.0" @@ -14491,6 +14486,11 @@ prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" +property-expr@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8" + integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA== + prosemirror-changeset@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz#dae94b63aec618fac7bb9061648e6e2a79988383" @@ -16836,6 +16836,11 @@ timed-out@^4.0.0, timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= +tiny-case@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-case/-/tiny-case-1.0.3.tgz#d980d66bc72b5d5a9ca86fb7c9ffdb9c898ddd03" + integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q== + tippy.js@^6.3.7: version "6.3.7" resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" @@ -16907,6 +16912,11 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg== + tough-cookie@^4.1.2, tough-cookie@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" @@ -18350,6 +18360,16 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== +yup@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/yup/-/yup-1.3.2.tgz#afffc458f1513ed386e6aaf4bcaa4e67a9e270dc" + integrity sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ== + dependencies: + property-expr "^2.0.5" + tiny-case "^1.0.3" + toposort "^2.0.2" + type-fest "^2.19.0" + zen-observable-ts@^1.2.0: version "1.2.3" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz#c2f5ccebe812faf0cfcde547e6004f65b1a6d769"