Skip to content

Commit f91deca

Browse files
kumaryash90kumaryash90
authored
Upgrade OZ dependencies (#251)
* OZ dependencies upgrade to v4.7.3 * correct interfaces in VoteERC20 * update error strings in tests * run prettier
1 parent cfb0a06 commit f91deca

File tree

9 files changed

+26
-44
lines changed

9 files changed

+26
-44
lines changed

‎contracts/vote/VoteERC20.sol‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,10 @@ import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQ
1515
// Meta transactions
1616
import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
1717

18-
// Utils
19-
import "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";
20-
import "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";
21-
22-
// Helper interfaces
23-
import "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155ReceiverUpgradeable.sol";
24-
import "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
25-
2618
contract VoteERC20 is
2719
Initializable,
2820
IThirdwebContract,
2921
ERC2771ContextUpgradeable,
30-
ERC721HolderUpgradeable,
31-
ERC1155HolderUpgradeable,
3222
GovernorUpgradeable,
3323
GovernorSettingsUpgradeable,
3424
GovernorCountingSimpleUpgradeable,
@@ -140,16 +130,8 @@ contract VoteERC20 is
140130
return GovernorSettingsUpgradeable.proposalThreshold();
141131
}
142132

143-
function supportsInterface(bytes4 interfaceId)
144-
public
145-
view
146-
override(ERC1155ReceiverUpgradeable, GovernorUpgradeable)
147-
returns (bool)
148-
{
149-
return
150-
interfaceId == type(IERC1155ReceiverUpgradeable).interfaceId ||
151-
interfaceId == type(IERC721ReceiverUpgradeable).interfaceId ||
152-
super.supportsInterface(interfaceId);
133+
function supportsInterface(bytes4 interfaceId) public view override returns (bool) {
134+
return interfaceId == type(IERC721ReceiverUpgradeable).interfaceId || super.supportsInterface(interfaceId);
153135
}
154136

155137
function _msgSender()

‎lib/forge-std‎

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@nomiclabs/hardhat-ethers": "^2.0.5",
1313
"@nomiclabs/hardhat-etherscan": "^3.0.3",
1414
"@nomiclabs/hardhat-waffle": "^2.0.3",
15-
"@openzeppelin/contracts": "4.5.0",
16-
"@openzeppelin/contracts-upgradeable": "4.5.1",
15+
"@openzeppelin/contracts": "4.7.3",
16+
"@openzeppelin/contracts-upgradeable": "4.7.3",
1717
"@primitivefi/hardhat-dodoc": "^0.2.0",
1818
"@thirdweb-dev/sdk": "^3.0.4",
1919
"@typechain/ethers-v5": "^10.0.0",

‎src/test/Multiwrap.t.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ contract MultiwrapTest is BaseTest {
446446
address recipient = address(0x123);
447447

448448
vm.prank(address(tokenOwner));
449-
vm.expectRevert("ERC721: transfer caller is not owner nor approved");
449+
vm.expectRevert("ERC721: caller is not token owner nor approved");
450450
multiwrap.wrap(wrappedContent, uriForWrappedToken, recipient);
451451
}
452452

@@ -485,7 +485,7 @@ contract MultiwrapTest is BaseTest {
485485
address recipient = address(0x123);
486486

487487
vm.prank(address(tokenOwner));
488-
vm.expectRevert("ERC721: transfer caller is not owner nor approved");
488+
vm.expectRevert("ERC721: caller is not token owner nor approved");
489489
multiwrap.wrap(wrappedContent, uriForWrappedToken, recipient);
490490
}
491491

@@ -498,7 +498,7 @@ contract MultiwrapTest is BaseTest {
498498
address recipient = address(0x123);
499499

500500
vm.prank(address(tokenOwner));
501-
vm.expectRevert("ERC1155: caller is not owner nor approved");
501+
vm.expectRevert("ERC1155: caller is not token owner nor approved");
502502
multiwrap.wrap(wrappedContent, uriForWrappedToken, recipient);
503503
}
504504

@@ -559,7 +559,7 @@ contract MultiwrapTest is BaseTest {
559559
vm.prank(recipient);
560560
multiwrap.unwrap(expectedIdForWrappedToken, recipient);
561561

562-
vm.expectRevert("ERC721: owner query for nonexistent token");
562+
vm.expectRevert("ERC721: invalid token ID");
563563
multiwrap.ownerOf(expectedIdForWrappedToken);
564564

565565
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));
@@ -622,7 +622,7 @@ contract MultiwrapTest is BaseTest {
622622
vm.prank(approvedCaller);
623623
multiwrap.unwrap(expectedIdForWrappedToken, recipient);
624624

625-
vm.expectRevert("ERC721: owner query for nonexistent token");
625+
vm.expectRevert("ERC721: invalid token ID");
626626
multiwrap.ownerOf(expectedIdForWrappedToken);
627627

628628
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));
@@ -854,7 +854,7 @@ contract MultiwrapTest is BaseTest {
854854
vm.prank(recipient);
855855
multiwrap.unwrap(expectedIdForWrappedToken, recipient);
856856

857-
vm.expectRevert("ERC721: owner query for nonexistent token");
857+
vm.expectRevert("ERC721: invalid token ID");
858858
multiwrap.ownerOf(expectedIdForWrappedToken);
859859

860860
assertEq(uriForWrappedToken, multiwrap.tokenURI(expectedIdForWrappedToken));

‎src/test/Pack.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ contract PackTest is BaseTest {
475475
address recipient = address(0x123);
476476

477477
vm.startPrank(address(tokenOwner));
478-
vm.expectRevert("ERC721: transfer caller is not owner nor approved");
478+
vm.expectRevert("ERC721: caller is not token owner nor approved");
479479
pack.createPack(packContents, numOfRewardUnits, packUri, 0, 1, recipient);
480480
}
481481

@@ -514,7 +514,7 @@ contract PackTest is BaseTest {
514514
address recipient = address(0x123);
515515

516516
vm.startPrank(address(tokenOwner));
517-
vm.expectRevert("ERC721: transfer caller is not owner nor approved");
517+
vm.expectRevert("ERC721: caller is not token owner nor approved");
518518
pack.createPack(packContents, numOfRewardUnits, packUri, 0, 1, recipient);
519519
}
520520

@@ -527,7 +527,7 @@ contract PackTest is BaseTest {
527527
address recipient = address(0x123);
528528

529529
vm.startPrank(address(tokenOwner));
530-
vm.expectRevert("ERC1155: caller is not owner nor approved");
530+
vm.expectRevert("ERC1155: caller is not token owner nor approved");
531531
pack.createPack(packContents, numOfRewardUnits, packUri, 0, 1, recipient);
532532
}
533533

‎src/test/airdrop/AirdropERC1155.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ contract AirdropERC1155Test is BaseTest {
8080

8181
vm.startPrank(deployer);
8282
drop.addAirdropRecipients(_contents);
83-
vm.expectRevert("ERC1155: caller is not owner nor approved");
83+
vm.expectRevert("ERC1155: caller is not token owner nor approved");
8484
drop.airdrop(_contents.length);
8585
vm.stopPrank();
8686
}

‎src/test/airdrop/AirdropERC721.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ contract AirdropERC721Test is BaseTest {
6969

7070
vm.startPrank(deployer);
7171
drop.addAirdropRecipients(_contents);
72-
vm.expectRevert("ERC721: transfer caller is not owner nor approved");
72+
vm.expectRevert("ERC721: caller is not token owner nor approved");
7373
drop.airdrop(_contents.length);
7474
vm.stopPrank();
7575
}

‎src/test/token/TokenERC721.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ contract TokenERC721Test is BaseTest {
347347
assertEq(tokenContract.totalSupply(), currentTotalSupply);
348348
assertEq(tokenContract.balanceOf(recipient), currentBalanceOfRecipient);
349349

350-
vm.expectRevert("ERC721: owner query for nonexistent token");
350+
vm.expectRevert("ERC721: invalid token ID");
351351
assertEq(tokenContract.ownerOf(nextTokenId), address(0));
352352
}
353353

@@ -374,7 +374,7 @@ contract TokenERC721Test is BaseTest {
374374
assertEq(tokenContract.totalSupply(), currentTotalSupply);
375375
assertEq(tokenContract.balanceOf(recipient), currentBalanceOfRecipient);
376376

377-
vm.expectRevert("ERC721: owner query for nonexistent token");
377+
vm.expectRevert("ERC721: invalid token ID");
378378
assertEq(tokenContract.ownerOf(nextTokenId), address(0));
379379
}
380380

‎yarn.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,20 +640,20 @@
640640
"@types/sinon-chai" "^3.2.3"
641641
"@types/web3" "1.0.19"
642642

643-
"@openzeppelin/contracts-upgradeable@4.5.1":
644-
version "4.5.1"
645-
resolved "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.1.tgz"
646-
integrity sha512-xcKycsSyFauIGMhSeeTJW/Jzz9jZUJdiFNP9Wo/9VhMhw8t5X0M92RY6x176VfcIWsxURMHFWOJVTlFA78HI/w==
643+
"@openzeppelin/contracts-upgradeable@4.7.3":
644+
version "4.7.3"
645+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.7.3.tgz#f1d606e2827d409053f3e908ba4eb8adb1dd6995"
646+
integrity sha512-+wuegAMaLcZnLCJIvrVUDzA9z/Wp93f0Dla/4jJvIhijRrPabjQbZe6fWiECLaJyfn5ci9fqf9vTw3xpQOad2A==
647647

648648
"@openzeppelin/contracts-upgradeable@^4.4.2":
649649
version "4.6.0"
650650
resolved "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.6.0.tgz"
651651
integrity sha512-5OnVuO4HlkjSCJO165a4i2Pu1zQGzMs//o54LPrwUgxvEO2P3ax1QuaSI0cEHHTveA77guS0PnNugpR2JMsPfA==
652652

653-
"@openzeppelin/contracts@4.5.0":
654-
version "4.5.0"
655-
resolved "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.5.0.tgz"
656-
integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==
653+
"@openzeppelin/contracts@4.7.3":
654+
version "4.7.3"
655+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.7.3.tgz#939534757a81f8d69cc854c7692805684ff3111e"
656+
integrity sha512-dGRS0agJzu8ybo44pCIf3xBaPQN/65AIXNgK8+4gzKd5kbvlqyxryUYVLJv7fK98Seyd2hDZzVEHSWAh0Bt1Yw==
657657

658658
"@openzeppelin/contracts@^4.4.2":
659659
version "4.7.0"

0 commit comments

Comments
 (0)