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

Upgrade to OZ 4.9.3 #2901

Merged
merged 4 commits into from
Nov 8, 2023
Merged

Upgrade to OZ 4.9.3 #2901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77333c2
Upgrade to OZ 4.9.3 and trim upgradeable fat
yorhodes Nov 7, 2023
bcc1e18
TEMP: Fix router hardhat tests
yorhodes Nov 8, 2023
1a5cab3
Revert unrelated changes
yorhodes Nov 8, 2023
eb8bba2
Revert more unrelated changes
yorhodes Nov 8, 2023
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
5 changes: 3 additions & 2 deletions solidity/contracts/token/extensions/HypERC721URIStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {HypERC721} from "../HypERC721.sol";
import {ERC721URIStorageUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721URIStorageUpgradeable.sol";
import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";

/**
* @title Hyperlane ERC721 Token that extends ERC721URIStorage with remote transfer and URI relay functionality.
Expand All @@ -17,7 +18,7 @@ contract HypERC721URIStorage is HypERC721, ERC721URIStorageUpgradeable {
function balanceOf(address account)
public
view
override(HypERC721, ERC721Upgradeable)
override(HypERC721, ERC721Upgradeable, IERC721Upgradeable)
returns (uint256)
{
return HypERC721.balanceOf(account);
Expand Down Expand Up @@ -75,7 +76,7 @@ contract HypERC721URIStorage is HypERC721, ERC721URIStorageUpgradeable {
function supportsInterface(bytes4 interfaceId)
public
view
override(ERC721EnumerableUpgradeable, ERC721Upgradeable)
override(ERC721EnumerableUpgradeable, ERC721URIStorageUpgradeable)
returns (bool)
{
return ERC721EnumerableUpgradeable.supportsInterface(interfaceId);
Expand Down
4 changes: 2 additions & 2 deletions solidity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dependencies": {
"@eth-optimism/contracts": "^0.6.0",
"@hyperlane-xyz/utils": "3.1.0-beta0",
"@openzeppelin/contracts": "^4.8.0",
"@openzeppelin/contracts-upgradeable": "^4.8.0"
"@openzeppelin/contracts": "^4.9.3",
"@openzeppelin/contracts-upgradeable": "^v4.9.3"
},
"devDependencies": {
"@nomiclabs/hardhat-ethers": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion typescript/helloworld/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@hyperlane-xyz/core": "3.1.0-beta0",
"@hyperlane-xyz/sdk": "3.1.0-beta0",
"@openzeppelin/contracts-upgradeable": "^4.8.0",
"@openzeppelin/contracts-upgradeable": "^4.9.3",
"ethers": "^5.7.2"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2782,8 +2782,8 @@ __metadata:
"@hyperlane-xyz/utils": "npm:3.1.0-beta0"
"@nomiclabs/hardhat-ethers": "npm:^2.2.1"
"@nomiclabs/hardhat-waffle": "npm:^2.0.3"
"@openzeppelin/contracts": "npm:^4.8.0"
"@openzeppelin/contracts-upgradeable": "npm:^4.8.0"
"@openzeppelin/contracts": "npm:^4.9.3"
"@openzeppelin/contracts-upgradeable": "npm:^v4.9.3"
"@typechain/ethers-v5": "npm:10.0.0"
"@typechain/hardhat": "npm:^6.0.0"
chai: "npm:^4.3.0"
Expand All @@ -2810,7 +2810,7 @@ __metadata:
"@hyperlane-xyz/sdk": "npm:3.1.0-beta0"
"@nomiclabs/hardhat-ethers": "npm:^2.2.1"
"@nomiclabs/hardhat-waffle": "npm:^2.0.3"
"@openzeppelin/contracts-upgradeable": "npm:^4.8.0"
"@openzeppelin/contracts-upgradeable": "npm:^4.9.3"
"@trivago/prettier-plugin-sort-imports": "npm:^3.2.0"
"@typechain/ethers-v5": "npm:10.0.0"
"@typechain/hardhat": "npm:^6.0.0"
Expand Down Expand Up @@ -3564,7 +3564,7 @@ __metadata:
languageName: node
linkType: hard

"@openzeppelin/contracts-upgradeable@npm:^4.8.0":
"@openzeppelin/contracts-upgradeable@npm:^4.9.3, @openzeppelin/contracts-upgradeable@npm:^v4.9.3":
version: 4.9.3
resolution: "@openzeppelin/contracts-upgradeable@npm:4.9.3"
checksum: d8fd6fd9d2271fbdd3958c20769b72a241687883ecd3bea05a3969568cdcabdee9d53c21ac776a651c397507d9c22d8db0a4fb970d27bdab918979fae7285a2f
Expand All @@ -3578,7 +3578,7 @@ __metadata:
languageName: node
linkType: hard

"@openzeppelin/contracts@npm:^4.8.0":
"@openzeppelin/contracts@npm:^4.9.3":
version: 4.9.3
resolution: "@openzeppelin/contracts@npm:4.9.3"
checksum: ce0a16a56a39b62d72370ac702bce1917096492442ff05de88521beda2c3f3935b93ee2b9a184614dd543a6181f2f0be10243f5a629be87aab284ade68c18320
Expand Down