Skip to content

Commit

Permalink
Use 4.6.0-rc.0 of @openzeppelin/contracts-upgradeable
Browse files Browse the repository at this point in the history
We use RC as it has a funcionality of `reinitializer` which supports
upgrades of the contracts from OpenZeppelin/openzeppelin-contracts#3232

We need to revisit this before mainnet deployment and switch to a final
package release if available.
  • Loading branch information
nkuba committed Apr 20, 2022
1 parent 33d595f commit 42e1a04
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
7 changes: 5 additions & 2 deletions solidity/ecdsa/contracts/WalletRegistry.sol
Expand Up @@ -32,6 +32,9 @@ import "@keep-network/random-beacon/contracts/ReimbursementPool.sol";
import "@threshold-network/solidity-contracts/contracts/staking/IApplication.sol";
import "@threshold-network/solidity-contracts/contracts/staking/IStaking.sol";

// TODO: We used RC version of @openzeppelin/contracts-upgradeable to use `reinitializer`
// in upgrades. We should revisit this part before mainnet deployment and use
// a final release package if it's ready.
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";

contract WalletRegistry is
Expand Down Expand Up @@ -261,8 +264,8 @@ contract WalletRegistry is

// TODO: revisit all initial values

dkgResultSubmissionGas = 288_000;
dkgResultApprovalGasOffset = 62_000;
dkgResultSubmissionGas = 272_000;
dkgResultApprovalGasOffset = 63_000;
notifyOperatorInactivityGasOffset = 86_000;

sortitionPoolRewardsBanDuration = 2 weeks;
Expand Down
1 change: 1 addition & 0 deletions solidity/ecdsa/package.json
Expand Up @@ -68,6 +68,7 @@
"@keep-network/random-beacon": "development",
"@keep-network/sortition-pools": "^2.0.0-pre.6",
"@openzeppelin/contracts": "^4.4.1",
"@openzeppelin/contracts-upgradeable": "^4.6.0-rc.0",
"@threshold-network/solidity-contracts": ">1.1.0-dev <1.1.0-ropsten"
},
"engines": {
Expand Down
5 changes: 5 additions & 0 deletions solidity/ecdsa/yarn.lock
Expand Up @@ -690,6 +690,11 @@
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.1.tgz#dc354082460eb34f5833afdecfab46538b208c4f"
integrity sha512-xcKycsSyFauIGMhSeeTJW/Jzz9jZUJdiFNP9Wo/9VhMhw8t5X0M92RY6x176VfcIWsxURMHFWOJVTlFA78HI/w==

"@openzeppelin/contracts-upgradeable@^4.6.0-rc.0":
version "4.6.0-rc.0"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.6.0-rc.0.tgz#80b6dcff3167ab2f86f9d08e6bd60c0332a5fee5"
integrity sha512-IQo98b6AlCGqpdgW1pxsUucqMu8x6WFJmusKMS4qoaVm3cifA/aQM/klHIAdr3pmVeZRjIM1gywQU85jzWEnAA==

"@openzeppelin/contracts@^4.1.0", "@openzeppelin/contracts@^4.3.2", "@openzeppelin/contracts@^4.4", "@openzeppelin/contracts@^4.4.1":
version "4.4.2"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.4.2.tgz#4e889c9c66e736f7de189a53f8ba5b8d789425c2"
Expand Down

0 comments on commit 42e1a04

Please sign in to comment.