Skip to content

Commit

Permalink
build: bumped osx and OZ dependency, removed gsn dependency (#500)
Browse files Browse the repository at this point in the history 
* build: bumped osx and removed gsn dependency

* build: bump oz dependency

* build: bump old osx version

* build: use OZ 4.9.5
  • Loading branch information
@heueristik
heueristik authored Dec 19, 2023
1 parent 20c3434 commit 215fd75
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 50 deletions.
11 changes: 6 additions & 5 deletions packages/contracts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,19 @@
"url": "https://github.com/aragon/osx/issues"
},
"homepage": "https://github.com/aragon/osx#readme",
"dependencies": {
"@ensdomains/ens-contracts": "0.0.11",
"@openzeppelin/contracts": "4.9.5",
"@openzeppelin/contracts-upgradeable": "4.9.5"
},
"devDependencies": {
"@aragon/osx-ethers-v1.2.0": "npm:@aragon/osx-ethers@1.2.0",
"@aragon/osx-v1.0.1": "npm:@aragon/osx@1.0.1",
"@aragon/osx-v1.3.0-rc0.4": "npm:@aragon/osx@1.3.0-rc0.4",
"@aragon/osx-v1.3.0": "npm:@aragon/osx@1.3.0",
"@defi-wonderland/smock": "^2.3.4",
"@ensdomains/ens-contracts": "0.0.11",
"@nomicfoundation/hardhat-chai-matchers": "^1.0.5",
"@nomicfoundation/hardhat-verify": "^1.0.4",
"@nomiclabs/hardhat-ethers": "^2.2.1",
"@opengsn/contracts": "2.2.6",
"@openzeppelin/contracts": "4.9.3",
"@openzeppelin/contracts-upgradeable": "4.9.3",
"@openzeppelin/hardhat-upgrades": "^1.23.1",
"@rollup/plugin-json": "^4.1.0",
"@typechain/ethers-v5": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/scripts/osx-versions-aliases.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
*/
export const OSX_VERSION_ALIASES = [
'@aragon/osx-v1.0.1/',
'@aragon/osx-v1.3.0-rc0.4/',
'@aragon/osx-v1.3.0/',
];
20 changes: 10 additions & 10 deletions packages/contracts/src/test/Migration.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ pragma solidity ^0.8.8;
*/

import {DAO as DAO_v1_0_0} from "@aragon/osx-v1.0.1/core/dao/DAO.sol";
import {DAO as DAO_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/core/dao/DAO.sol";
import {DAO as DAO_v1_3_0} from "@aragon/osx-v1.3.0/core/dao/DAO.sol";
import {DAORegistry as DAORegistry_v1_0_0} from "@aragon/osx-v1.0.1/framework/dao/DAORegistry.sol";
import {DAORegistry as DAORegistry_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/framework/dao/DAORegistry.sol";
import {DAORegistry as DAORegistry_v1_3_0} from "@aragon/osx-v1.3.0/framework/dao/DAORegistry.sol";

import {PluginRepo as PluginRepo_v1_0_0} from "@aragon/osx-v1.0.1/framework/plugin/repo/PluginRepo.sol";
import {PluginRepo as PluginRepo_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/framework/plugin/repo/PluginRepo.sol";
import {PluginRepo as PluginRepo_v1_3_0} from "@aragon/osx-v1.3.0/framework/plugin/repo/PluginRepo.sol";

import {PluginRepoRegistry as PluginRepoRegistry_v1_0_0} from "@aragon/osx-v1.0.1/framework/plugin/repo/PluginRepoRegistry.sol";
import {PluginRepoRegistry as PluginRepoRegistry_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/framework/plugin/repo/PluginRepoRegistry.sol";
import {PluginRepoRegistry as PluginRepoRegistry_v1_3_0} from "@aragon/osx-v1.3.0/framework/plugin/repo/PluginRepoRegistry.sol";

import {ENSSubdomainRegistrar as ENSSubdomainRegistrar_v1_0_0} from "@aragon/osx-v1.0.1/framework/utils/ens/ENSSubdomainRegistrar.sol";
import {ENSSubdomainRegistrar as ENSSubdomainRegistrar_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/framework/utils/ens/ENSSubdomainRegistrar.sol";
import {ENSSubdomainRegistrar as ENSSubdomainRegistrar_v1_3_0} from "@aragon/osx-v1.3.0/framework/utils/ens/ENSSubdomainRegistrar.sol";

import {TokenVoting as TokenVoting_v1_0_0} from "@aragon/osx-v1.0.1/plugins/governance/majority-voting/token/TokenVoting.sol";
import {TokenVoting as TokenVoting_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/plugins/governance/majority-voting/token/TokenVoting.sol";
import {TokenVoting as TokenVoting_v1_3_0} from "@aragon/osx-v1.3.0/plugins/governance/majority-voting/token/TokenVoting.sol";

import {AddresslistVoting as AddresslistVoting_v1_0_0} from "@aragon/osx-v1.0.1/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol";
import {AddresslistVoting as AddresslistVoting_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol";
import {AddresslistVoting as AddresslistVoting_v1_3_0} from "@aragon/osx-v1.3.0/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol";

import {Multisig as Multisig_v1_0_0} from "@aragon/osx-v1.0.1/plugins/governance/multisig/Multisig.sol";
import {Multisig as Multisig_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/plugins/governance/multisig/Multisig.sol";
import {Multisig as Multisig_v1_3_0} from "@aragon/osx-v1.3.0/plugins/governance/multisig/Multisig.sol";

import {GovernanceERC20 as GovernanceERC20_v1_0_0} from "@aragon/osx-v1.0.1/token/ERC20/governance/GovernanceERC20.sol";
import {GovernanceERC20 as GovernanceERC20_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/token/ERC20/governance/GovernanceERC20.sol";
import {GovernanceERC20 as GovernanceERC20_v1_3_0} from "@aragon/osx-v1.3.0/token/ERC20/governance/GovernanceERC20.sol";

import {GovernanceWrappedERC20 as GovernanceWrappedERC20_v1_0_0} from "@aragon/osx-v1.0.1/token/ERC20/governance/GovernanceWrappedERC20.sol";
import {GovernanceWrappedERC20 as GovernanceWrappedERC20_v1_3_0} from "@aragon/osx-v1.3.0-rc0.4/token/ERC20/governance/GovernanceWrappedERC20.sol";
import {GovernanceWrappedERC20 as GovernanceWrappedERC20_v1_3_0} from "@aragon/osx-v1.3.0/token/ERC20/governance/GovernanceWrappedERC20.sol";
2 changes: 1 addition & 1 deletion packages/contracts/test/core/dao/dao.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
PermissionConditionMock,
} from '../../../typechain';
import {DAO__factory as DAO_V1_0_0__factory} from '../../../typechain/@aragon/osx-v1.0.1/core/dao/DAO.sol';
import {DAO__factory as DAO_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0-rc0.4/core/dao/DAO.sol';
import {DAO__factory as DAO_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0/core/dao/DAO.sol';
import {ExecutedEvent} from '../../../typechain/DAO';
import {findEvent, DAO_EVENTS} from '../../../utils/event';
import {flipBit} from '../../test-utils/bitmap';
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/framework/dao/dao-registry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ENSSubdomainRegistrar,
} from '../../../typechain';
import {DAORegistry__factory as DAORegistry_V1_0_0__factory} from '../../../typechain/@aragon/osx-v1.0.1/framework/dao/DAORegistry.sol';
import {DAORegistry__factory as DAORegistry_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0-rc0.4/framework/dao/DAORegistry.sol';
import {DAORegistry__factory as DAORegistry_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0/framework/dao/DAORegistry.sol';
import {ensDomainHash, ensLabelHash} from '../../../utils/ens';
import {deployNewDAO} from '../../test-utils/dao';
import {deployENSSubdomainRegistrar} from '../../test-utils/ens';
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/framework/plugin/plugin-repo-registry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
PluginRepoRegistry__factory,
} from '../../../typechain';
import {PluginRepoRegistry__factory as PluginRepoRegistry_V1_0_0__factory} from '../../../typechain/@aragon/osx-v1.0.1/framework/plugin/repo/PluginRepoRegistry.sol';
import {PluginRepoRegistry__factory as PluginRepoRegistry_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0-rc0.4/framework/plugin/repo/PluginRepoRegistry.sol';
import {PluginRepoRegistry__factory as PluginRepoRegistry_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0/framework/plugin/repo/PluginRepoRegistry.sol';
import {ensDomainHash} from '../../../utils/ens';
import {deployNewDAO} from '../../test-utils/dao';
import {deployENSSubdomainRegistrar} from '../../test-utils/ens';
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/framework/plugin/plugin-repo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
IProtocolVersion__factory,
} from '../../../typechain';
import {PluginRepo__factory as PluginRepo_V1_0_0__factory} from '../../../typechain/@aragon/osx-v1.0.1/framework/plugin/repo/PluginRepo.sol';
import {PluginRepo__factory as PluginRepo_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0-rc0.4/framework/plugin/repo/PluginRepo.sol';
import {PluginRepo__factory as PluginRepo_V1_3_0__factory} from '../../../typechain/@aragon/osx-v1.3.0/framework/plugin/repo/PluginRepo.sol';
import {ZERO_BYTES32} from '../../test-utils/dao';
import {getInterfaceID} from '../../test-utils/interfaces';
import {UPGRADE_PERMISSIONS} from '../../test-utils/permissions';
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/framework/utils/ens/ens-subdomain-registry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
ENSSubdomainRegistrar__factory,
} from '../../../../typechain';
import {ENSSubdomainRegistrar__factory as ENSSubdomainRegistrar_V1_0_0__factory} from '../../../../typechain/@aragon/osx-v1.0.1/framework/utils/ens/ENSSubdomainRegistrar.sol';
import {ENSSubdomainRegistrar__factory as ENSSubdomainRegistrar_V1_3_0__factory} from '../../../../typechain/@aragon/osx-v1.3.0-rc0.4/framework/utils/ens/ENSSubdomainRegistrar.sol';
import {ENSSubdomainRegistrar__factory as ENSSubdomainRegistrar_V1_3_0__factory} from '../../../../typechain/@aragon/osx-v1.3.0/framework/utils/ens/ENSSubdomainRegistrar.sol';
import {ensDomainHash, ensLabelHash} from '../../../../utils/ens';
import {deployNewDAO} from '../../../test-utils/dao';
import {setupResolver} from '../../../test-utils/ens';
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/interfaces.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {IMajorityVoting__factory as IMajorityVoting_V1_0_0__factory} from '../ty
import {IMultisig__factory as IMultisig_V1_0_0__factory} from '../typechain/@aragon/osx-v1.0.1/plugins/governance/multisig/IMultisig.sol';
import {IERC20MintableUpgradeable__factory as IERC20MintableUpgradeable_V1_0_0__factory} from '../typechain/@aragon/osx-v1.0.1/token/ERC20/IERC20MintableUpgradeable.sol';
import {IGovernanceWrappedERC20__factory as IGovernanceWrappedERC20_V1_0_0__factory} from '../typechain/@aragon/osx-v1.0.1/token/ERC20/governance/IGovernanceWrappedERC20.sol';
import {IProtocolVersion__factory as IProtocolVersion_V1_3_0__factory} from '../typechain/@aragon/osx-v1.3.0-rc0.4/utils/protocol/IProtocolVersion.sol';
import {IProtocolVersion__factory as IProtocolVersion_V1_3_0__factory} from '../typechain/@aragon/osx-v1.3.0/utils/protocol/IProtocolVersion.sol';
import {getInterfaceID} from './test-utils/interfaces';
import {expect} from 'chai';

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
IProtocolVersion__factory,
} from '../../../../../typechain';
import {AddresslistVoting__factory as AddresslistVoting_V1_0_0__factory} from '../../../../../typechain/@aragon/osx-v1.0.1/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol';
import {AddresslistVoting__factory as AddresslistVoting_V1_3_0__factory} from '../../../../../typechain/@aragon/osx-v1.3.0-rc0.4/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol';
import {AddresslistVoting__factory as AddresslistVoting_V1_3_0__factory} from '../../../../../typechain/@aragon/osx-v1.3.0/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol';
import {
ProposalCreatedEvent,
ProposalExecutedEvent,
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
TokenVoting__factory,
} from '../../../../../typechain';
import {TokenVoting__factory as TokenVoting_V1_0_0__factory} from '../../../../../typechain/@aragon/osx-v1.0.1/plugins/governance/majority-voting/token/TokenVoting.sol';
import {TokenVoting__factory as TokenVoting_V1_3_0__factory} from '../../../../../typechain/@aragon/osx-v1.3.0-rc0.4/plugins/governance/majority-voting/token/TokenVoting.sol';
import {TokenVoting__factory as TokenVoting_V1_3_0__factory} from '../../../../../typechain/@aragon/osx-v1.3.0/plugins/governance/majority-voting/token/TokenVoting.sol';
import {ExecutedEvent} from '../../../../../typechain/DAO';
import {
ProposalCreatedEvent,
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/plugins/governance/multisig/multisig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
Multisig__factory,
} from '../../../../typechain';
import {Multisig__factory as Multisig_V1_0_0__factory} from '../../../../typechain/@aragon/osx-v1.0.1/plugins/governance/multisig/Multisig.sol';
import {Multisig__factory as Multisig_V1_3_0__factory} from '../../../../typechain/@aragon/osx-v1.3.0-rc0.4/plugins/governance/multisig/Multisig.sol';
import {Multisig__factory as Multisig_V1_3_0__factory} from '../../../../typechain/@aragon/osx-v1.3.0/plugins/governance/multisig/Multisig.sol';
import {ExecutedEvent} from '../../../../typechain/DAO';
import {ProposalCreatedEvent} from '../../../../typechain/IProposal';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/upgrade/dao.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
import {
DAO as DAO_V1_3_0,
DAO__factory as DAO_V1_3_0__factory,
} from '../../typechain/@aragon/osx-v1.3.0-rc0.4/core/dao/DAO.sol';
} from '../../typechain/@aragon/osx-v1.3.0/core/dao/DAO.sol';
import {UpgradedEvent} from '../../typechain/DAO';
import {findEventTopicLog} from '../../utils/event';
import {readImplementationValueFromSlot} from '../../utils/storage';
Expand Down
36 changes: 12 additions & 24 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.0.1.tgz#b758ba87db93a46a8ddabfaefc99ac8e44c46c78"
integrity sha512-TiP5/1AGv/hth+V8PoDVFlwMzmLazYxzp//jiepAZ0WJkx9EnQNYafo+M7+pjAqRPG005liQjmFZNiK6ARLULg==

"@aragon/osx-v1.3.0-rc0.4@npm:@aragon/osx@1.3.0-rc0.4":
version "1.3.0-rc0.4"
resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.3.0-rc0.4.tgz#c42eba799d9ac57fbe10d5c73bf02681c5d4328d"
integrity sha512-vE+zW5LUaPFDvsWWDCESFjibERvWtwsOyqb1pUaB+OS8j9eEZVxsRaSWhe23Nx2vAhUtTF9p77e1vWtCfP/BvQ==
"@aragon/osx-v1.3.0@npm:@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==
dependencies:
"@ensdomains/ens-contracts" "0.0.11"
"@openzeppelin/contracts" "4.8.1"
Expand Down Expand Up @@ -1883,43 +1883,31 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@opengsn/contracts@2.2.6":
version "2.2.6"
resolved "https://registry.yarnpkg.com/@opengsn/contracts/-/contracts-2.2.6.tgz#1784326bc243be2f33cd0171550d3a7f35aa412f"
integrity sha512-NraQgKZZUp7/ipLzpe2wd6lqX6w5PbLtHaKOFirm+zJYeCDoG9d6xrVc2VlDwjapMTJyWlYxuXSwOZQhHEMrAg==
dependencies:
"@openzeppelin/contracts" "^4.2.0"

"@openzeppelin/contracts-upgradeable@4.8.1":
version "4.8.1"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.1.tgz#363f7dd08f25f8f77e16d374350c3d6b43340a7a"
integrity sha512-1wTv+20lNiC0R07jyIAbHU7TNHKRwGiTGRfiNnA8jOWjKT98g5OgLpYWOi40Vgpk8SPLA9EvfJAbAeIyVn+7Bw==

"@openzeppelin/contracts-upgradeable@4.9.3":
version "4.9.3"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.3.tgz#ff17a80fb945f5102571f8efecb5ce5915cc4811"
integrity sha512-jjaHAVRMrE4UuZNfDwjlLGDxTHWIOwTJS2ldnc278a0gevfXfPr8hxKEVBGFBE96kl2G3VHDZhUimw/+G3TG2A==
"@openzeppelin/contracts-upgradeable@4.9.5":
version "4.9.5"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.5.tgz#572b5da102fc9be1d73f34968e0ca56765969812"
integrity sha512-f7L1//4sLlflAN7fVzJLoRedrf5Na3Oal5PZfIq55NFcVZ90EpV1q5xOvL4lFvg3MNICSDr2hH0JUBxwlxcoPg==

"@openzeppelin/contracts@4.8.1":
version "4.8.1"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.1.tgz#709cfc4bbb3ca9f4460d60101f15dac6b7a2d5e4"
integrity sha512-xQ6eUZl+RDyb/FiZe1h+U7qr/f4p/SrTSQcTPH2bjur3C5DbuW/zFgCU/b1P/xcIaEqJep+9ju4xDRi3rmChdQ==

"@openzeppelin/contracts@4.9.3":
version "4.9.3"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364"
integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==
"@openzeppelin/contracts@4.9.5":
version "4.9.5"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.5.tgz#1eed23d4844c861a1835b5d33507c1017fa98de8"
integrity sha512-ZK+W5mVhRppff9BE6YdR8CC52C8zAvsVAiWhEtQ5+oNxFE6h1WdeWo+FJSF8KKvtxxVYZ7MTP/5KoVpAU3aSWg==

"@openzeppelin/contracts@^4.1.0":
version "4.6.0"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.6.0.tgz#c91cf64bc27f573836dba4122758b4743418c1b3"
integrity sha512-8vi4d50NNya/bQqCmaVzvHNmwHvS0OBKb7HNtuNwEE3scXWrP31fKQoGxNMT+KbzmrNZzatE3QK5p2gFONI/hg==

"@openzeppelin/contracts@^4.2.0":
version "4.5.0"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc"
integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==

"@openzeppelin/hardhat-upgrades@^1.23.1":
version "1.23.1"
resolved "https://registry.yarnpkg.com/@openzeppelin/hardhat-upgrades/-/hardhat-upgrades-1.23.1.tgz#45b47f7083493dae7339782aeeafd68606f76488"
Expand Down

0 comments on commit 215fd75

Please sign in to comment.