From 50a51c8c27df29bc89d77b40717269541129fda9 Mon Sep 17 00:00:00 2001 From: Claudia Barcelo Date: Wed, 12 Feb 2025 17:03:49 +0100 Subject: [PATCH] Feat: use new sdk version (#40) * feat: send the file content and the jwt as param * feat: bump sdk version * fix: pinnata env var only needed when not running on local --- .../deploy/20_new_version/23_publish.ts | 14 +++++++--- packages/contracts/package.json | 2 +- packages/contracts/yarn.lock | 26 +++++-------------- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/packages/contracts/deploy/20_new_version/23_publish.ts b/packages/contracts/deploy/20_new_version/23_publish.ts index 7701df98..bb8599a2 100644 --- a/packages/contracts/deploy/20_new_version/23_publish.ts +++ b/packages/contracts/deploy/20_new_version/23_publish.ts @@ -57,14 +57,20 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { let buildMetadataURI = '0x'; if (!isLocal(hre)) { + if (!process.env.PUB_PINATA_JWT) { + throw Error('PUB_PINATA_JWT is not set'); + } + // Upload the metadata to IPFS releaseMetadataURI = await uploadToPinata( - JSON.stringify(METADATA.release, null, 2), - `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-release-metadata` + METADATA.release, + `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-release-metadata`, + process.env.PUB_PINATA_JWT ); buildMetadataURI = await uploadToPinata( - JSON.stringify(METADATA.build, null, 2), - `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-build-metadata` + METADATA.build, + `${PLUGIN_REPO_ENS_SUBDOMAIN_NAME}-build-metadata`, + process.env.PUB_PINATA_JWT ); } console.log(`Uploaded release metadata: ${releaseMetadataURI}`); diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b022f7df..9b5a6110 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -36,7 +36,7 @@ "@aragon/osx-v1.3.0": "npm:@aragon/osx@1.3.0", "@aragon/osx-commons-configs": "^0.8.0", "@aragon/osx-ethers": "^1.4.0", - "@aragon/osx-commons-sdk": "^0.1.0", + "@aragon/osx-commons-sdk": "^0.2.0", "@matterlabs/hardhat-zksync-deploy": "0.8", "@matterlabs/hardhat-zksync-node": "0.1.0", "@matterlabs/hardhat-zksync-solc": "1.2.5", diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock index 4b85139d..4f0847af 100644 --- a/packages/contracts/yarn.lock +++ b/packages/contracts/yarn.lock @@ -2,13 +2,6 @@ # yarn lockfile v1 -"@aragon/osx-commons-configs@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-configs/-/osx-commons-configs-0.4.0.tgz#5b6ae025de1ccf7f9a135bfbcb0aa822c774acf9" - integrity sha512-/2wIQCbv/spMRdOjRXK0RrXG1TK5aMcbD73RvMgMwQwSrKcA1dCntUuSxmTm2W8eEtOzs8E1VPjqZk0cXL4SSQ== - dependencies: - tslib "^2.6.2" - "@aragon/osx-commons-configs@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@aragon/osx-commons-configs/-/osx-commons-configs-0.8.0.tgz#71e27c7063c3ca7a26a2c5ae12594063800bd9db" @@ -24,20 +17,18 @@ "@openzeppelin/contracts" "4.9.6" "@openzeppelin/contracts-upgradeable" "4.9.6" -"@aragon/osx-commons-sdk@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.1.0.tgz#ec027744e2d9275d1c5535e356fc3607339c44c9" - integrity sha512-T7svAQsfMIpADvAKLnicS7bNV54EE9q8vFUOZy1hh5oF9N/07qD2eeXqXZ9W0uWEKfgpbIyZKV6k+X5kt2kklQ== +"@aragon/osx-commons-sdk@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.2.0.tgz#e5ca5db172866775a02337c22af3a05ac16541fa" + integrity sha512-bxzvIbxdQtObqLPrJlJcPuy2cMzrE9TI7zlNMcbKnyr4swp44ZHZi5NKcwX1eFAf+oZc1aFlehb1gPwPMvaT8Q== dependencies: - "@aragon/osx-commons-configs" "^0.4.0" + "@aragon/osx-commons-configs" "^0.8.0" "@ethersproject/address" "5.7.0" "@ethersproject/bignumber" "5.7.0" "@ethersproject/contracts" "5.7.0" "@ethersproject/hash" "5.7.0" "@ethersproject/logger" "5.7.0" "@ethersproject/providers" "5.7.2" - dotenv "^16.4.5" - undici "^6.21.0" "@aragon/osx-ethers@^1.4.0": version "1.4.0" @@ -3380,11 +3371,6 @@ dotenv@^16.3.1: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== -dotenv@^16.4.5: - version "16.4.7" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26" - integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ== - dunder-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" @@ -8499,7 +8485,7 @@ undici@^5.14.0: dependencies: "@fastify/busboy" "^2.0.0" -undici@^6.18.2, undici@^6.19.5, undici@^6.21.0: +undici@^6.18.2, undici@^6.19.5: version "6.21.1" resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.1.tgz#336025a14162e6837e44ad7b819b35b6c6af0e05" integrity sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==