Merge pull request #44 from aragon/feat/bump-versions

bump versions

packages/contracts/.eslintrc.yml

@@ -16,3 +16,5 @@ ignorePatterns:
   - typechain
   # files
   - coverage.json
+  - docs/config.js
+  - scripts/gen-nav.js

packages/contracts/docs/config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 
-const { version, repository } = require('../package.json');
+const {version, repository} = require('../package.json');
 
 const helpers = require(path.resolve(__dirname, './templates/helpers'));
 

packages/contracts/docs/modules/ROOT/pages/index.adoc

@@ -1,6 +1,6 @@
 = Multisig
 
-WARNING: This documentation shows the *build 3* which uses *1.4 protocol version*. Currently, these are being audited. Even though, contracts are backwards compatible, we do *NOT* recommend using these latest versions in production until audit is finished.
+WARNING: This documentation shows the *build 3* which uses *1.4 protocol version*.
 
 == Description
 

packages/contracts/hardhat-zksync.config.ts

@@ -35,18 +35,17 @@ extendEnvironment(hre => {
   hre.aragonToVerifyContracts = [];
 });
 
-task('build-contracts').setAction(async (args, hre) => {
-  await hre.run('compile');
-
-  const network = hre.network.name;
-  if (isZkSync(network)) {
+task('compile').setAction(async (args, hre, runSuper) => {
+  await runSuper(args);
+  if (isZkSync(hre.network.name)) {
     // Copy zkSync specific build artifacts and cache to the default directories.
     // This ensures that we don't need to change import paths for artifacts in the project.
     fs.cpSync('./build/artifacts-zk', './artifacts', {
       recursive: true,
       force: true,
     });
     fs.cpSync('./build/cache-zk', './cache', {recursive: true, force: true});
+
     return;
   }
 
@@ -63,8 +62,8 @@ task('deploy-contracts')
     });
   });
 
-task('test-contracts').setAction(async (args, hre) => {
-  await hre.run('build-contracts');
+task('test').setAction(async (args, hre, runSuper) => {
+  await hre.run('compile');
   const imp = await import('./test/test-utils/wrapper');
 
   const wrapper = await imp.Wrapper.create(
@@ -73,7 +72,7 @@ task('test-contracts').setAction(async (args, hre) => {
   );
   hre.wrapper = wrapper;
 
-  await hre.run('test');
+  await runSuper(args);
 });
 
 // You need to export an object to set up your config

packages/contracts/hardhat.config.ts

@@ -33,7 +33,9 @@ if (process.env.ALCHEMY_API_KEY) {
   throw new Error('ALCHEMY_API_KEY in .env not set');
 }
 
-task('test-contracts').setAction(async (args, hre) => {
+// Override the test task so it injects wrapper.
+// Note that this also gets injected when running it through coverage.
+task('test').setAction(async (args, hre, runSuper) => {
   await hre.run('compile');
   const imp = await import('./test/test-utils/wrapper');
 
@@ -43,7 +45,7 @@ task('test-contracts').setAction(async (args, hre) => {
   );
   hre.wrapper = wrapper;
 
-  await hre.run('test');
+  await runSuper(args);
 });
 
 // Fetch the accounts specified in the .env file

packages/contracts/package.json

@@ -1,32 +1,38 @@
 {
+  "name": "@aragon/multisig-plugin",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aragon/multisig-plugin"
+  },
+  "author": "Aragon",
   "license": "AGPL-3.0-or-later",
   "version": "1.4.0-alpha.1",
   "scripts": {
     "build": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
-    "build:zksync": "hardhat build-contracts --config hardhat-zksync.config.ts && yarn typechain",
+    "build:zksync": "hardhat compile --config hardhat-zksync.config.ts && yarn typechain",
     "coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
     "deploy": "hardhat deploy",
     "deploy:zksync": "hardhat deploy-contracts --config hardhat-zksync.config.ts",
     "lint": "yarn lint:sol && yarn lint:ts",
     "lint:sol": "cd ../../ && yarn run lint:contracts:sol",
     "lint:ts": "cd ../../ && yarn run lint:contracts:ts",
     "docs": "DOCS=true scripts/prepare-docs.sh",
-    "test": "hardhat test-contracts",
-    "test:zksync": "hardhat test-contracts --config hardhat-zksync.config.ts",
-    "docgen": "hardhat docgen",
+    "test": "hardhat test",
+    "test:zksync": "hardhat test --config hardhat-zksync.config.ts",
     "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
     "clean": "rimraf ./artifacts ./cache ./coverage ./typechain ./coverage.json && yarn typechain"
   },
   "dependencies": {
-    "@aragon/osx-commons-contracts": "1.4.0-alpha.5",
+    "@aragon/osx-commons-contracts": "^1.4.0",
     "@openzeppelin/contracts": "^4.9.6",
     "@openzeppelin/contracts-upgradeable": "^4.9.6"
   },
   "devDependencies": {
-    "@aragon/osx-commons-configs": "0.4.0",
-    "@aragon/osx-commons-sdk": "0.0.1-alpha.11",
-    "@aragon/osx-ethers": "^1.4.0-alpha.0",
-    "@aragon/osx": "1.3.0",
+    "@aragon/osx-commons-configs": "^0.8.0",
+    "@aragon/osx-commons-sdk": "^0.1.0",
+    "@aragon/osx-ethers": "^1.4.0",
+    "@aragon/osx": "^1.4.0",
     "@aragon/osx-v1.0.0": "npm:@aragon/[email protected]",
     "@aragon/osx-v1.3.0": "npm:@aragon/[email protected]",
     "@matterlabs/hardhat-zksync-deploy": "0.8",
@@ -71,10 +77,6 @@
     "typescript": "^5.2.2",
     "undici": "^6.11.1"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aragon/multisig-plugin"
-  },
   "files": [
     "/src"
   ],

packages/contracts/yarn.lock

@@ -2,25 +2,32 @@
 # yarn lockfile v1
 
 
-"@aragon/osx-commons-configs@0.4.0", "@aragon/osx-commons-configs@^0.4.0":
+"@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/[email protected]":
-  version "1.4.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/@aragon/osx-commons-contracts/-/osx-commons-contracts-1.4.0-alpha.5.tgz#37a28085677c21216628ba0a05f5fe09489eb71c"
-  integrity sha512-F2JWWxmUNmiJsaXcTDyd6F2GUIgnc313vvWTp/cSmSVkccT2pfMleWqxIi4LIodX3ueFUYfE02rLj8Gjp1jljA==
+"@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"
+  integrity sha512-O8CIKxm+jCN4sq8DBAISlo+Y75VKY03uMqGVP1bUxshqW3ax42r2vlYtTRE/0dJgS9Yh5ElO1tVfDutsGoYWoA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@aragon/[email protected]", "@aragon/osx-commons-contracts@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@aragon/osx-commons-contracts/-/osx-commons-contracts-1.4.0.tgz#61eda9fbfa19ab76cd7e33c688a2269c5e9f937b"
+  integrity sha512-EufkwHD9BfktIQcaLmvLfY0RXJ/ztbVtB0UtQTVyWZpWALbfUVtHtIC8D9/8JoYVbe8FyDi+btpbBQj79Iwrkg==
   dependencies:
     "@openzeppelin/contracts" "4.9.6"
     "@openzeppelin/contracts-upgradeable" "4.9.6"
 
-"@aragon/osx-commons-sdk@0.0.1-alpha.11":
-  version "0.0.1-alpha.11"
-  resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.11.tgz#1e3e39aac3351b6649921a5e373a5146b86b2c92"
-  integrity sha512-/FgTLnS73QY0JxZYQlHwpd2ZuMPkPKdIlci9T4jgH9E4Eyyxh6GX7fJK+HekCcf6oMS5tTZ/Cb3sVyyzoO95iw==
+"@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==
   dependencies:
     "@aragon/osx-commons-configs" "^0.4.0"
     "@ethersproject/address" "5.7.0"
@@ -29,12 +36,13 @@
     "@ethersproject/hash" "5.7.0"
     "@ethersproject/logger" "5.7.0"
     "@ethersproject/providers" "5.7.2"
-    ipfs-http-client "^51.0.0"
+    dotenv "^16.4.5"
+    undici "^6.21.0"
 
-"@aragon/osx-ethers@^1.4.0-alpha.0":
-  version "1.4.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.4.0-alpha.0.tgz#329f1ac27660b486fa0b296dddeb004ce352001c"
-  integrity sha512-fFsrG/XMIjZe3MxVQdf87gqAC4q0Z/eBp72QUuzXJQ0gMSTSj/4TvveFn1N8toLN6KsJolMEkaTamyCGYR+5iA==
+"@aragon/osx-ethers@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.4.0.tgz#b36b61973ef50798706c2645056a4ff6dc357f4a"
+  integrity sha512-7DoidZNuFHkps9oYuU+da/NJ+ItPXpfu9wja5vHtS0ExFMcU8ZbCDJGBaDMc0m/Q0kNeFIinCeQS6e1lUDx7VA==
   dependencies:
     ethers "^5.6.2"
 
@@ -52,14 +60,15 @@
     "@openzeppelin/contracts" "4.8.1"
     "@openzeppelin/contracts-upgradeable" "4.8.1"
 
-"@aragon/osx@1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.3.0.tgz#eee59963546016bb3b41b7c7a9b7c41d33b37de2"
-  integrity sha512-ziLmnhWEoFS/uthxAYfI9tSylesMLTDe69XggKP9LK/tIOKAhyYjfAJ2mbhWZcH558c9o0gzAEErkDhqh/wdog==
+"@aragon/osx@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.4.0.tgz#36ff0671e214ff331625cbcc67cd7f80ce276153"
+  integrity sha512-FY9GizdhRXCLOuy/pADbLD3BsFZ9c+4JmvGC4DB7mauyck8yY2Itf4RhFG3X/afzVihex0bNths4wIf90ZaaUA==
   dependencies:
+    "@aragon/osx-commons-contracts" "1.4.0"
     "@ensdomains/ens-contracts" "0.0.11"
-    "@openzeppelin/contracts" "4.8.1"
-    "@openzeppelin/contracts-upgradeable" "4.8.1"
+    "@openzeppelin/contracts" "4.9.6"
+    "@openzeppelin/contracts-upgradeable" "4.9.6"
 
 "@aws-crypto/[email protected]":
   version "1.2.2"
@@ -3140,7 +3149,7 @@ dot-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
-dotenv@^16.3.1:
+dotenv@^16.3.1, dotenv@^16.4.5:
   version "16.4.7"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
   integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
@@ -7635,7 +7644,7 @@ undici@^5.14.0:
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
-undici@^6.11.1:
+undici@^6.11.1, undici@^6.21.0:
   version "6.21.1"
   resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.1.tgz#336025a14162e6837e44ad7b819b35b6c6af0e05"
   integrity sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==