Bump versions (#635)

* bump versions

* bump versions

* update node version in workflow

* fix import case-sensitive and prettier

.github/workflows/contract-tests.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: cd ../../ && yarn install --pure-lockfile
       - name: Compile contracts

.github/workflows/documentation-update.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Clean the contracts directory

.github/workflows/npm-release-reusable.yml

@@ -53,7 +53,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: yarn install --pure-lockfile

.github/workflows/style-check.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: yarn install --pure-lockfile
       - name: Check with prettier

.github/workflows/subgraph-deploy.yaml

@@ -85,7 +85,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: yarn install --pure-lockfile
       - name: Build Contracts

.github/workflows/subgraph-tests.yml

@@ -42,7 +42,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: yarn install --pure-lockfile
       - name: Build manifest
@@ -64,7 +64,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: 'yarn'
-          node-version: 16
+          node-version: 18
       - name: Install dependencies
         run: yarn
       - name: Build contracts

packages/contracts-ethers/CHANGELOG.md

@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v0.4.0-alpha]
+## v1.4.0
+
+## v0.4.0-alpha
 
 ### Changed
 

packages/contracts-ethers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx-ethers",
-  "version": "1.4.0-alpha.0",
+  "version": "1.4.0",
   "description": "The Aragon OSx contract definitions for ethers.js",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",

packages/contracts/deployed_contracts_detailed.json

@@ -179,4 +179,4 @@
     "blockNumber": 6049615,
     "deploymentTx": "0xfffd61156da1bd2025474958a7a2632c84bccff4e536acb9b3a2b58b9db03f25"
   }
-}
+}

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/hardhat-zksync.config.ts

@@ -1,5 +1,5 @@
 import {TestingFork} from './types/hardhat';
-import {ZK_SYNC_NETWORKS} from './utils/zkSync';
+import {ZK_SYNC_NETWORKS} from './utils/zksync';
 import RichAccounts from './utils/zksync-rich-accounts';
 import {addRpcUrlToNetwork} from '@aragon/osx-commons-configs';
 import '@matterlabs/hardhat-zksync-deploy';
@@ -41,8 +41,8 @@ extendEnvironment(hre => {
   hre.testingFork = testingFork;
 });
 
-task('build-contracts').setAction(async (args, hre) => {
-  await hre.run('compile');
+task('compile').setAction(async (args, hre, runSuper) => {
+  await runSuper(args);
 
   if (ZK_SYNC_NETWORKS.includes(hre.network.name)) {
     // Copy zkSync specific build artifacts and cache to the default directories.
@@ -63,14 +63,14 @@ task('build-contracts').setAction(async (args, hre) => {
 task('deploy-contracts')
   .addOptionalParam('tags', 'Specify which tags to deploy')
   .setAction(async (args, hre) => {
-    await hre.run('build-contracts');
+    await hre.run('compile');
     await hre.run('deploy', {
       tags: args.tags,
     });
   });
 
-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(
@@ -79,7 +79,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

@@ -63,7 +63,9 @@ const ENABLE_DEPLOY_TEST = process.env.TEST_UPDATE_DEPLOY_SCRIPT !== undefined;
 
 console.log('Is deploy test is enabled: ', ENABLE_DEPLOY_TEST);
 
-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');
 
@@ -73,7 +75,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/package.json

@@ -16,11 +16,11 @@
     "typechain:osx-versions": "ts-node scripts/generate-typechain-osx-versions.ts",
     "typechain": "yarn typechain:osx && yarn typechain:osx-versions",
     "test:parallel": "hardhat test --parallel",
-    "test": "hardhat test-contracts",
+    "test": "hardhat test",
     "test:report-gas": "REPORT_GAS=true hardhat test",
-    "test:zksync": "hardhat test-contracts --config hardhat-zksync.config.ts",
+    "test:zksync": "hardhat test --config hardhat-zksync.config.ts",
     "build": "hardhat compile && yarn typechain",
-    "build:zksync": "hardhat build-contracts --config hardhat-zksync.config.ts && yarn typechain",
+    "build:zksync": "hardhat compile --config hardhat-zksync.config.ts && yarn typechain",
     "build:npm": "rollup --config rollup.config.ts",
     "coverage": "hardhat coverage --solcoverjs ./.solcover.js",
     "flatten": "hardhat flatten",
@@ -45,14 +45,14 @@
   },
   "homepage": "https://github.com/aragon/osx#readme",
   "dependencies": {
-    "@aragon/osx-commons-contracts": "1.4.0-alpha.5",
+    "@aragon/osx-commons-contracts": "1.4.0",
     "@ensdomains/ens-contracts": "0.0.11",
     "@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-commons-configs": "^0.8.0",
+    "@aragon/osx-commons-sdk": "^0.1.0",
     "@aragon/osx-ethers-v1.2.0": "npm:@aragon/[email protected]",
     "@aragon/osx-v1.0.1": "npm:@aragon/[email protected]",
     "@aragon/osx-v1.3.0": "npm:@aragon/[email protected]",

packages/contracts/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx",
-  "version": "1.4.0-rc0",
+  "version": "1.4.0",
   "description": "The Aragon OSx Solidity contracts",
   "publishConfig": {
     "access": "public"
@@ -16,7 +16,7 @@
   },
   "homepage": "https://github.com/aragon/osx#readme",
   "dependencies": {
-    "@aragon/osx-commons-contracts": "1.4.0-alpha.5",
+    "@aragon/osx-commons-contracts": "1.4.0",
     "@ensdomains/ens-contracts": "0.0.11",
     "@openzeppelin/contracts": "4.9.6",
     "@openzeppelin/contracts-upgradeable": "4.9.6"

packages/contracts/src/test/ProtocolVersionMock.sol

@@ -6,6 +6,4 @@ import {ProtocolVersion} from "@aragon/osx-commons-contracts/src/utils/versionin
 
 /// @title ProtocolVersionMock
 // solhint-disable-next-line no-empty-blocks
-contract ProtocolVersionMock is ProtocolVersion {
-
-}
+contract ProtocolVersionMock is ProtocolVersion {}

packages/contracts/test/test-utils/skip-functions.ts

@@ -1,4 +1,4 @@
-import {ZK_SYNC_NETWORKS} from '../../utils/zkSync';
+import {ZK_SYNC_NETWORKS} from '../../utils/zksync';
 import hre from 'hardhat';
 
 // ANSI escape codes for colored terminal output