Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(smart-contracts): rollback @oz/upgrades-core to 1.33.1 #14059

Merged
merged 3 commits into from
Jun 17, 2024
Merged

fix(smart-contracts): rollback @oz/upgrades-core to 1.33.1 #14059

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d52eb8
disallow internal function check on udt 3
clemsos Jun 17, 2024
deb3257
force oz upgrades cote version
clemsos Jun 17, 2024
ac8c305
Merge branch 'master' into fix-oz-upgrades-udt-bug
clemsos Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion governance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@nomicfoundation/hardhat-verify": "2.0.8",
"@nomiclabs/hardhat-ethers": "2.2.3",
"@openzeppelin/hardhat-upgrades": "3.1.1",
"@openzeppelin/upgrades-core": "1.33.1",
"@openzeppelin/upgrades-core": "1.34.0",
"@safe-global/api-kit": "2.3.1",
"@safe-global/protocol-kit": "3.1.1",
"@tenderly/hardhat-tenderly": "2.2.2",
Expand Down
2 changes: 1 addition & 1 deletion smart-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.0.2",
"@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.0.2",
"@openzeppelin/hardhat-upgrades": "3.1.1",
"@openzeppelin/upgrades-core": "1.33.1",
"@openzeppelin/upgrades-core": "1.34.0",
"@safe-global/safe-core-sdk": "3.3.5",
"@safe-global/safe-ethers-lib": "1.9.3",
"@safe-global/safe-service-client": "2.0.3",
Expand Down
1 change: 1 addition & 0 deletions smart-contracts/test/fixtures/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module.exports = async () => {
const UDTv3 = await ethers.getContractFactory('UnlockDiscountTokenV3')
const udt = await upgrades.deployProxy(UDTv3, [await minter.getAddress()], {
initializer: 'initialize(address)',
unsafeAllow: ['internal-function-storage'],
})

return {
Expand Down
24 changes: 3 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10584,25 +10584,7 @@ __metadata:
languageName: node
linkType: hard

"@openzeppelin/upgrades-core@npm:1.33.1":
version: 1.33.1
resolution: "@openzeppelin/upgrades-core@npm:1.33.1"
dependencies:
cbor: "npm:^9.0.0"
chalk: "npm:^4.1.0"
compare-versions: "npm:^6.0.0"
debug: "npm:^4.1.1"
ethereumjs-util: "npm:^7.0.3"
minimist: "npm:^1.2.7"
proper-lockfile: "npm:^4.1.1"
solidity-ast: "npm:^0.4.51"
bin:
openzeppelin-upgrades-core: dist/cli/cli.js
checksum: 10/09a145ab9ca79237231daa2dc984d3257db10557ec48ced70e5862822a29a2011407b4761d1cd1ac17e1637a0ac64e5541c9a112f1b35d01f4313873aaa8514f
languageName: node
linkType: hard

"@openzeppelin/upgrades-core@npm:^1.31.3, @openzeppelin/upgrades-core@npm:^1.32.0, @openzeppelin/upgrades-core@npm:^1.32.2":
"@openzeppelin/upgrades-core@npm:1.34.0, @openzeppelin/upgrades-core@npm:^1.31.3, @openzeppelin/upgrades-core@npm:^1.32.0, @openzeppelin/upgrades-core@npm:^1.32.2":
version: 1.34.0
resolution: "@openzeppelin/upgrades-core@npm:1.34.0"
dependencies:
Expand Down Expand Up @@ -16626,7 +16608,7 @@ __metadata:
"@nomicfoundation/hardhat-verify": "npm:2.0.8"
"@nomiclabs/hardhat-ethers": "npm:2.2.3"
"@openzeppelin/hardhat-upgrades": "npm:3.1.1"
"@openzeppelin/upgrades-core": "npm:1.33.1"
"@openzeppelin/upgrades-core": "npm:1.34.0"
"@safe-global/api-kit": "npm:2.3.1"
"@safe-global/protocol-kit": "npm:3.1.1"
"@tenderly/hardhat-tenderly": "npm:2.2.2"
Expand Down Expand Up @@ -16867,7 +16849,7 @@ __metadata:
"@openzeppelin/contracts-upgradeable5": "npm:@openzeppelin/contracts-upgradeable@5.0.2"
"@openzeppelin/contracts5": "npm:@openzeppelin/contracts@5.0.2"
"@openzeppelin/hardhat-upgrades": "npm:3.1.1"
"@openzeppelin/upgrades-core": "npm:1.33.1"
"@openzeppelin/upgrades-core": "npm:1.34.0"
"@safe-global/safe-core-sdk": "npm:3.3.5"
"@safe-global/safe-ethers-lib": "npm:1.9.3"
"@safe-global/safe-service-client": "npm:2.0.3"
Expand Down
Loading