fix ipfs

aragon · Dec 1, 2023 · 09e6644 · 09e6644
1 parent 170ace9
commit 09e6644
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/modules/client/src/internal/utils.ts b/modules/client/src/internal/utils.ts
@@ -78,6 +78,7 @@ import {
   InvalidParameter,
   InvalidPermissionOperationType,
   MultiTargetPermission,
+  MultiUri,
   NotImplementedError,
   PermissionIds,
   PermissionOperationType,
@@ -1230,9 +1231,10 @@ export async function validateApplyUpdateFunction(
   const build = release?.builds.find((
     build: { build: number; metadata: string },
   ) => build.build === decodedParams.versionTag.build);
-  const metadataCid = build?.metadata;
+  const metadataUri = build?.metadata;
 
   // fetch the metadata
+  const metadataCid = new MultiUri(metadataUri!).ipfsCid
   const metadata = await ipfs.fetchString(metadataCid!);
   const metadataJson = JSON.parse(metadata) as PluginRepoBuildMetadata;
   // get the update abi for the specified build

diff --git a/modules/client/test/integration/client/methods.test.ts b/modules/client/test/integration/client/methods.test.ts
@@ -1950,7 +1950,7 @@ describe("Client", () => {
             id: ADDRESS_ONE,
           }],
           dao: subgraphDao,
-          pluginPreparation: subgraphPluginPreparation,
+          pluginPreparations: [subgraphPluginPreparation],
           pluginRepo: subgraphPluginRepo,
         });
         mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
@@ -1970,7 +1970,7 @@ describe("Client", () => {
             id: ADDRESS_ONE,
           }],
           dao: subgraphDao,
-          pluginPreparation: subgraphPluginPreparation,
+          pluginPreparations: [subgraphPluginPreparation],
           pluginRepo: subgraphPluginRepo,
         });
         const res = await client.methods.isPluginUpdateProposalValid(
@@ -1989,7 +1989,7 @@ describe("Client", () => {
             id: ADDRESS_ONE,
           }],
           dao: subgraphDao,
-          pluginPreparation: subgraphPluginPreparation,
+          pluginPreparations: [subgraphPluginPreparation],
           pluginRepo: subgraphPluginRepo,
         });
         const res = await client.methods.isPluginUpdateProposalValid(

diff --git a/modules/client/test/unit/client/utils.test.ts b/modules/client/test/unit/client/utils.test.ts
@@ -705,7 +705,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -732,7 +732,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -767,7 +767,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -802,7 +802,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -857,7 +857,7 @@ describe("Test client utils", () => {
         pluginRepo: externalPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -911,7 +911,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify(TOKEN_VOTING_BUILD_METADATA),
@@ -939,7 +939,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedIPFSClient.cat.mockResolvedValueOnce(Buffer.from(
         JSON.stringify({}),
@@ -967,7 +967,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: null,
+        pluginPreparations: [],
       });
       const result = await validateApplyUpdateFunction(
         action,
@@ -1066,7 +1066,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedClient.request.mockResolvedValueOnce({
         pluginInstallations: [{
@@ -1107,7 +1107,7 @@ describe("Test client utils", () => {
         pluginRepo: subgraphPluginRepo,
       });
       mockedClient.request.mockResolvedValueOnce({
-        pluginPreparation: subgraphPluginPreparation,
+        pluginPreparations: [subgraphPluginPreparation],
       });
       mockedClient.request.mockResolvedValueOnce({
         pluginInstallations: [{
@@ -1154,7 +1154,7 @@ describe("Test client utils", () => {
           pluginRepo: subgraphPluginRepo,
         });
         mockedClient.request.mockResolvedValueOnce({
-          pluginPreparation: subgraphPluginPreparation,
+          pluginPreparations: [subgraphPluginPreparation],
         });
         mockedClient.request.mockResolvedValueOnce({
           pluginInstallations: [{