Skip to content

Commit

Permalink
release: deploy v1.3.0 (#509)
Browse files Browse the repository at this point in the history
* docs(contracts): removes outdated step in upgrade checklist

* deploy(contracts): adds v1.3.0 mainnet deployment

* deploy(contracts): adds polygon deployment

* fix: removes uncessary inconsistent managingDAOImplementation field from active_contracts.json

* chore: bump package version to v1.3.0

* chore: updates version for osx package

* chore(contracts): updates changelog

* chore(contracts): updates active_contracts with implementations and bases

* chore(contracts): moves line in changelog
  • Loading branch information
mathewmeconry authored Dec 12, 2023
1 parent 40f342b commit e90ea8f
Show file tree
Hide file tree
Showing 7 changed files with 451 additions and 343 deletions.
1 change: 0 additions & 1 deletion UPDATE_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ This checklist is seen as a guide to update the existing deployment.
- [ ] initialize the storage correctly
- [ ] Make sure that the `deploy` property in `packages/contracts/networks.json` points to the correct update
- [ ] Run `yarn` in the repository root to install the dependencies
- [ ] Run `yarn run build:contracts-versions` in `packages/contracts` to make sure the contracts compile
- [ ] Run `yarn build` in `packages/contracts` to make sure the contracts compile
- [ ] Run `yarn test` in `packages/contracts` to make sure the contract tests succeed
- [ ] Set `ETH_KEY` in `.env` to the deployers private key. It doesn't have to be the previous deployer
Expand Down
145 changes: 121 additions & 24 deletions active_contracts.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contracts-ethers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/osx-ethers",
"version": "1.3.0-rc0.4",
"version": "1.3.0",
"description": "The Aragon OSx contract definitions for ethers.js",
"main": "dist/bundle-cjs.js",
"module": "dist/bundle-esm.js",
Expand Down
15 changes: 3 additions & 12 deletions packages/contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,10 @@ 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).

## v1.3.1-rc0
## v1.3.0

### Added

### Changed

- Added missing `virtual` keyword to `PermissionCondition` and `PermissionConditionUpgradeable`.

### Removed

## v1.3.0-rc0

### Added

- Added `PermissionCondition` and `PermissionConditionUpgradeable` to have ERC-165 support for `IPermissionCondition` implementations.
- Inherit `ProtocolVersion` and `ERC165` in `DAOFactory` and `PluginRepoFactory`.
- Inherit `ProtocolVersion` in `DAO` and `PluginRepo`.
- Added a `nonReentrant` modifier to the `execute` function in the `DAO` contract.
Expand All @@ -28,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Added missing `virtual` keyword to `PermissionCondition` and `PermissionConditionUpgradeable`.
- Added `PermissionCondition` and `PermissionConditionUpgradeable` to have ERC-165 support for `IPermissionCondition` implementations.
- Changed `TokenVotingSetup` to receive the `GovernanceERC20` and `GovernanceWrappedERC20` base contracts as constructor arguments to reduce the `initCode` size because of limitations on the Goerli testnet.
- Revert with errors (`ConditionNotAContract`, `ConditionInterfacNotSupported`) if the `grantWithCondition` function in `PermissionManager` is called with a condition address that is not a `IPermissionCondition` implementation.
- `_grantWithCondition()` doesn't accept `ALLOW_FLAG` anymore as valid condition input.
Expand Down
627 changes: 324 additions & 303 deletions packages/contracts/Releases.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/osx-artifacts",
"version": "1.3.0-rc0.4",
"version": "1.3.0",
"description": "The Aragon OSx Solidity contracts",
"main": "dist/bundle-cjs.js",
"module": "dist/bundle-esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/osx",
"version": "1.3.0-rc0.4",
"version": "1.3.0",
"description": "The Aragon OSx Solidity contracts",
"publishConfig": {
"access": "public"
Expand Down

0 comments on commit e90ea8f

Please sign in to comment.