Merge pull request #34 from aragon/feat/update-to-use-upload-to-pinnata

Feat: update to use upload to pinnata
aragon · Jan 20, 2025 · 6eea634 · 6eea634
2 parents a976099 + fffc680
commit 6eea634
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/packages/contracts/deploy/20_new_version/23_publish.ts b/packages/contracts/deploy/20_new_version/23_publish.ts
@@ -12,7 +12,7 @@ import {
   isLocal,
   pluginEnsDomain,
 } from '../../utils/helpers';
-import {PLUGIN_REPO_PERMISSIONS, uploadToIPFS} from '@aragon/osx-commons-sdk';
+import {PLUGIN_REPO_PERMISSIONS, uploadToPinata} from '@aragon/osx-commons-sdk';
 import {writeFile} from 'fs/promises';
 import {ethers} from 'hardhat';
 import {DeployFunction} from 'hardhat-deploy/types';
@@ -31,13 +31,21 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {deployments} = hre;
   const [deployer] = await hre.ethers.getSigners();
 
-  // Upload the metadata to IPFS
-  const releaseMetadataURI = `ipfs://${await uploadToIPFS(
-    JSON.stringify(METADATA.release, null, 2)
-  )}`;
-  const buildMetadataURI = `ipfs://${await uploadToIPFS(
-    JSON.stringify(METADATA.build, null, 2)
-  )}`;
+  // metadata will be empty if running locally
+  let releaseMetadataURI = '';
+  let buildMetadataURI = '';
+
+  if (!isLocal(hre)) {
+    // Upload the metadata to IPFS
+    releaseMetadataURI = await uploadToPinata(
+      JSON.stringify(METADATA.release, null, 2),
+      `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-release-metadata`
+    );
+    buildMetadataURI = await uploadToPinata(
+      JSON.stringify(METADATA.build, null, 2),
+      `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-build-metadata`
+    );
+  }
 
   console.log(`Uploaded release metadata: ${releaseMetadataURI}`);
   console.log(`Uploaded build metadata: ${buildMetadataURI}`);

diff --git a/packages/contracts/test/20_integration-testing/21_deployment.ts b/packages/contracts/test/20_integration-testing/21_deployment.ts
@@ -1,4 +1,4 @@
-import {METADATA, VERSION} from '../../plugin-settings';
+import {VERSION, PLUGIN_SETUP_CONTRACT_NAME} from '../../plugin-settings';
 import {getProductionNetworkName, findPluginRepo} from '../../utils/helpers';
 import {
   getLatestNetworkDeployment,
@@ -9,7 +9,6 @@ import {
   PERMISSION_MANAGER_FLAGS,
   PLUGIN_REPO_PERMISSIONS,
   UnsupportedNetworkError,
-  uploadToIPFS,
 } from '@aragon/osx-commons-sdk';
 import {
   DAO,
@@ -65,22 +64,16 @@ describe(`Deployment on network '${productionNetworkName}'`, function () {
 
   context('PluginSetup Publication', async () => {
     it('registers the setup', async () => {
-      const {pluginRepo} = await loadFixture(fixture);
+      const {pluginRepo, pluginSetupAddr} = await loadFixture(fixture);
 
       const results = await pluginRepo['getVersion((uint8,uint16))']({
         release: VERSION.release,
         build: VERSION.build,
       });
 
-      const buildMetadataURI = `ipfs://${await uploadToIPFS(
-        JSON.stringify(METADATA.build, null, 2)
-      )}`;
-
-      expect(results.buildMetadata).to.equal(
-        ethers.utils.hexlify(ethers.utils.toUtf8Bytes(buildMetadataURI))
-      );
-
+      expect(results.pluginSetup).to.equal(pluginSetupAddr);
       expect(results.tag.build).to.equal(VERSION.build);
+      expect(results.tag.release).to.equal(VERSION.release);
     });
   });
 });
@@ -90,6 +83,7 @@ type FixtureResult = {
   pluginRepo: PluginRepo;
   pluginRepoRegistry: PluginRepoRegistry;
   managementDaoProxy: DAO;
+  pluginSetupAddr: string;
 };
 
 async function fixture(): Promise<FixtureResult> {
@@ -126,5 +120,14 @@ async function fixture(): Promise<FixtureResult> {
     deployer
   );
 
-  return {deployer, pluginRepo, pluginRepoRegistry, managementDaoProxy};
+  const pluginSetupAddr = (await deployments.get(PLUGIN_SETUP_CONTRACT_NAME))
+    .address;
+
+  return {
+    deployer,
+    pluginRepo,
+    pluginRepoRegistry,
+    managementDaoProxy,
+    pluginSetupAddr,
+  };
 }