Skip to content

Commit

Permalink
Merge remote-tracking branch 'template/develop' into feature/refactor…
Browse files Browse the repository at this point in the history
…-helpers
  • Loading branch information
heueristik committed Apr 23, 2024
2 parents 57da5c3 + 3e9e3b4 commit e4fafc0
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
16 changes: 8 additions & 8 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
"clean": "rimraf ./artifacts ./cache ./coverage ./typechain ./types ./coverage.json && yarn typechain"
},
"dependencies": {
"@aragon/osx-commons-contracts": "1.4.0-alpha.4",
"@aragon/osx-commons-contracts": "1.4.0-alpha.5",
"@openzeppelin/contracts": "^4.9.6",
"@openzeppelin/contracts-upgradeable": "^4.9.6"
},
"devDependencies": {
"@aragon/osx-commons-configs": "0.4.0",
"@aragon/osx-ethers": "1.4.0-alpha.0",
"@aragon/osx-commons-sdk": "0.0.1-alpha.8",
"@ethersproject/abi": "^5.7.0",
"@ethersproject/abstract-signer": "^5.7.0",
"@ethersproject/bignumber": "^5.7.0",
"@ethersproject/bytes": "^5.7.0",
"@ethersproject/providers": "^5.7.2",
"@aragon/osx-commons-sdk": "0.0.1-alpha.11",
"@ethersproject/abi": "5.7.0",
"@ethersproject/abstract-signer": "5.7.0",
"@ethersproject/bignumber": "5.7.0",
"@ethersproject/bytes": "5.7.0",
"@ethersproject/providers": "5.7.2",
"@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
"@nomicfoundation/hardhat-network-helpers": "^1.0.8",
"@nomicfoundation/hardhat-toolbox": "^2.0.2",
Expand All @@ -41,7 +41,7 @@
"chai": "^4.3.7",
"cross-env": "^7.0.3",
"dotenv": "^16.3.1",
"ethers": "^5.7.2",
"ethers": "5.7.2",
"hardhat": "^2.13.1",
"hardhat-deploy": "^0.11.26",
"hardhat-gas-reporter": "^1.0.9",
Expand Down
30 changes: 16 additions & 14 deletions packages/contracts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@
dependencies:
tslib "^2.6.2"

"@aragon/[email protected].4":
version "1.4.0-alpha.4"
resolved "https://registry.yarnpkg.com/@aragon/osx-commons-contracts/-/osx-commons-contracts-1.4.0-alpha.4.tgz#87bb8cbbd401683add9b3dc4cbee3eb0c20f7785"
integrity sha512-RBkynt/XA1U8dapinFDycCvbTnXXRPNKGUklBdHys/MDOe57hEDjbXyFSKM562KC0s4hocTFx6U9sGNKp+90hw==
"@aragon/[email protected].5":
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==
dependencies:
"@openzeppelin/contracts" "4.9.6"
"@openzeppelin/contracts-upgradeable" "4.9.6"

"@aragon/[email protected].8":
version "0.0.1-alpha.8"
resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.8.tgz#c75d9f9c8f6f90e76ff00d07081f5a5231fc66d3"
integrity sha512-zWr/Fr3Sz0fxfDOKT8FLrQVDQhAyyo7LwWg/wXlasjw1XjoJwfasCjs2gssG6KJz7XzNUVHPjKJmWfvfbTuOAw==
"@aragon/[email protected].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==
dependencies:
"@aragon/osx-commons-configs" "^0.4.0"
"@ethersproject/bignumber" "^5.7.0"
"@ethersproject/contracts" "^5.7.0"
"@ethersproject/hash" "^5.7.0"
"@ethersproject/providers" "^5.7.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"
ipfs-http-client "^51.0.0"

"@aragon/[email protected]":
Expand Down Expand Up @@ -317,7 +319,7 @@
dependencies:
"@ethersproject/logger" "^5.7.0"

"@ethersproject/[email protected]", "@ethersproject/providers@^5.7.0", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2":
"@ethersproject/[email protected]", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2":
version "5.7.2"
resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb"
integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==
Expand Down Expand Up @@ -2484,7 +2486,7 @@ ethereumjs-util@^7.0.3, ethereumjs-util@^7.1.4:
ethereum-cryptography "^0.1.3"
rlp "^2.2.4"

ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2:
ethers@5.7.2, ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==
Expand Down

0 comments on commit e4fafc0

Please sign in to comment.