update: upgrade @openzeppelin contract packages to latest 5.0.0 version (#536) #541

quiet-node · 2023-10-27T19:23:19Z

Description:

Upgrade @openzeppelin/contracts and @openzeppelin/upgradable-contracts to latest v5.0.0
Modified smart contracts utilizing OZ contracts to match with latest changes
Fixed warnings
Recompiled all contracts
In order to bypass the upgrade safe checks from hardhat-updates's .deployProxy() method, contract OZUUPSUpgradeableV4 is added. This OZUUPSUpgradeableV4 is a clone of the UUPSUpgradable contract from OZ @v5.x but with an extra upgradeTo function. This contract is only for unblocking purpose and should be deprecated in the future release when we upgrade to [email protected]

Related issue(s):

Fixes #536

Notes for reviewer:

Checklist

Documented (Code comments, README, etc.)
Tested (unit, integration, etc.)

github-actions · 2023-10-27T19:31:39Z

Test Results

  15 files ±0   65 suites - 1 8m 0s ⏱️ +13s
195 tests - 3 188 ✔️ - 2 6 💤 ±0 1 ❌ - 1
205 runs - 3 198 ✔️ - 2 6 💤 ±0 1 ❌ - 1

For more details on these failures, see this check.

Results for commit 04191df. ± Comparison against base commit e0413d3.

This pull request removes 3 tests.

should create a new snapshot and emit a Snapshot event ‑ ERC20ExtensionsMock tests ERC20Snapshot tests should create a new snapshot and emit a Snapshot event
should return the correct balanceOfAt(address, snapshotId) ‑ ERC20ExtensionsMock tests ERC20Snapshot tests should return the correct balanceOfAt(address, snapshotId)
should return the correct totalSupplyAt(snapshotId) ‑ ERC20ExtensionsMock tests ERC20Snapshot tests should return the correct totalSupplyAt(snapshotId)

♻️ This comment has been updated with latest results.

quiet-node · 2023-10-28T17:40:27Z

test/foundry/mocks/hts-precompile/HederaNonFungibleToken.sol

@@ -138,15 +138,6 @@ contract HederaNonFungibleToken is ERC721, Constants {
        return super.transferFrom(from, to, tokenId);
    }

-    function safeTransferFrom(address from, address to, uint256 tokenId) public override {


notice: This is being removed as OZ/contract v5.0.0 only allows override safeTransferFrom(address,address,uint256,bytes), and safeTransaferFrom(address,address,uint256) will cause error Trying to override non-virtual function.

Nana-EC

Great work, blocking until we cut a 0.6 release branch

stefan-stefanooov · 2023-11-01T15:44:13Z

Nicely done ... I have several branches that I want to rebase on this one. Waiting for the merger...
@Nana-EC what is the plan ? When are we cutting 0.6 ?

Signed-off-by: Logan Nguyen <[email protected]>

…n(); Signed-off-by: Logan Nguyen <[email protected]>

Signed-off-by: Logan Nguyen <[email protected]>

As OZ/contract v5.0.0 only allow override safeTransferFrom(address,address,uint256,bytes), safeTransaferFrom(address,address,uint256) will cause error `Trying to override non-virtual function.` Signed-off-by: Logan Nguyen <[email protected]>

Signed-off-by: Logan Nguyen <[email protected]>

Nana-EC

Mostly good.
2 items

Nana-EC · 2023-11-03T22:11:04Z

contracts/proxy-upgrade/exchange/OZUUPSUpgradeableV4.sol

@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: MIT


Suggested change

// SPDX-License-Identifier: MIT

// SPDX-License-Identifier: Apache-2.0

Nana-EC · 2023-11-03T22:16:01Z

contracts/solidity/inhetitance/Main.sol

@@ -14,8 +14,4 @@ contract Main is Base {
    function returnSuper() public view virtual returns (string memory) {
        return super.classIdentifier();
    }
-
-    function destroyContract(address recipient) public {


Please restore.
We can remove it separately but until Cancun let's maintain the coverage

Nana-EC · 2023-11-03T22:16:15Z

local.env

@@ -8,6 +8,6 @@ OPERATOR_KEY_A= 302e020100300506032b65700422042091132178e72057a1d7528025956fe39b
 # ECDSA HEX Encoded Private Key
 HEX_PRIVATE_KEY_A= 0x2e1d968b041d84dd120a5860cee60cd83f9374ef527ca86996317ada3d0d03e7
 HEX_PRIVATE_KEY_B= 0x45a5a7108a18dd5013cf2d5857a28144beadc9c70b3bdbd914e38df4e804b8d8
-RETRY_DELAY=3000 # ms
+RETRY_DELAY=4000 # ms


Q:why the increase?

The should be able to execute cryptoTransfer for hbar transfer only unit test in the TokenTransferContract Test Suite test suite was consistently failing with as the data doesn't have enough time to reflect the changes so I decided to increase it for 1000 more ms.

I understand but it seems strange that 1 min (3000 ms * 20) isn't enough.
Now we're making it 80s (4000ms *20) something is up.
What is happening that requires this long of retries?

test/foundry/mocks/hts-precompile/HederaNonFungibleToken.sol

Signed-off-by: Logan Nguyen <[email protected]>

quiet-node added enhancement New feature or request P2 EVM evm related labels Oct 27, 2023

quiet-node self-assigned this Oct 27, 2023

quiet-node requested review from AlfredoG87, AleksandrinaAleksieva, ebadiere, georgi-l95, Ivo-Yankov, natanasow, yiliev0, a team and Nana-EC as code owners October 27, 2023 19:23

quiet-node marked this pull request as draft October 27, 2023 19:25

quiet-node force-pushed the 536-Upgrade-@openzeppelin/contracts-npm-package-to-latest-5.x- branch 2 times, most recently from ae3fc1e to f9a2db5 Compare October 27, 2023 22:20

quiet-node commented Oct 28, 2023

View reviewed changes

quiet-node marked this pull request as ready for review November 1, 2023 15:29

Nana-EC requested changes Nov 1, 2023

View reviewed changes

quiet-node added 9 commits November 3, 2023 16:46

update(docs): upgraded OZ packages to latest version 5.0.0

312d4d6

Signed-off-by: Logan Nguyen <[email protected]>

update: removed ERC20SnapshotMock contract

29b1205

Signed-off-by: Logan Nguyen <[email protected]>

update: replaced OZ/SafeMath.sol to OZ/Math.sol

f4e4c92

Signed-off-by: Logan Nguyen <[email protected]>

fix: replaced _getImplementation() with ERC1967Utils.getImplementatio…

7a9d06f

…n(); Signed-off-by: Logan Nguyen <[email protected]>

fix: passed arguments to the new Ownable base constructor

6d7a2be

Signed-off-by: Logan Nguyen <[email protected]>

fix: fixed warnings

9beeacc

Signed-off-by: Logan Nguyen <[email protected]>

update: re-compiled all contracts

df4b1ae

Signed-off-by: Logan Nguyen <[email protected]>

update: replaced _isApprovedOrOwner with new _isAuthorized override

3e45c51

Signed-off-by: Logan Nguyen <[email protected]>

update: removed ERC20Snapshot in unit tests

2e4f197

Signed-off-by: Logan Nguyen <[email protected]>

quiet-node added 6 commits November 3, 2023 16:46

update: add more to RETRY_DELAY

1255025

Signed-off-by: Logan Nguyen <[email protected]>

feat: added OZUUPSUpgradeableV4 to bypass safeUpgrade checks

eb39b93

Signed-off-by: Logan Nguyen <[email protected]>

update: re-compiled all contracts

7f1a63c

Signed-off-by: Logan Nguyen <[email protected]>

feat: added OZUUPSUpgradeableV4 to bypass safeUpgrade checks

1077242

Signed-off-by: Logan Nguyen <[email protected]>

update: recompiled contracts that utilized OZUUPSUpgradeableV4

5b5b4bb

Signed-off-by: Logan Nguyen <[email protected]>

quiet-node force-pushed the 536-Upgrade-@openzeppelin/contracts-npm-package-to-latest-5.x- branch from b5903c3 to 5b5b4bb Compare November 3, 2023 21:49

Nana-EC requested changes Nov 3, 2023

View reviewed changes

quiet-node added 2 commits November 3, 2023 17:22

update: updated license

202148f

Signed-off-by: Logan Nguyen <[email protected]>

update: restored destroyContract()

04191df

Signed-off-by: Logan Nguyen <[email protected]>

Nana-EC approved these changes Nov 3, 2023

View reviewed changes

quiet-node merged commit 271fa2e into main Nov 3, 2023
20 of 21 checks passed

quiet-node deleted the 536-Upgrade-@openzeppelin/contracts-npm-package-to-latest-5.x- branch November 3, 2023 23:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update: upgrade @openzeppelin contract packages to latest 5.0.0 version (#536) #541

update: upgrade @openzeppelin contract packages to latest 5.0.0 version (#536) #541

quiet-node commented Oct 27, 2023 •

edited

Loading

github-actions bot commented Oct 27, 2023 •

edited

Loading

quiet-node Oct 28, 2023

Nana-EC left a comment

stefan-stefanooov commented Nov 1, 2023 •

edited

Loading

Nana-EC left a comment

Nana-EC Nov 3, 2023

Nana-EC Nov 3, 2023

Nana-EC Nov 3, 2023

quiet-node Nov 3, 2023

Nana-EC Nov 3, 2023

	// SPDX-License-Identifier: MIT
	// SPDX-License-Identifier: Apache-2.0

update: upgrade @openzeppelin contract packages to latest 5.0.0 version (#536) #541

update: upgrade @openzeppelin contract packages to latest 5.0.0 version (#536) #541

Conversation

quiet-node commented Oct 27, 2023 • edited Loading

github-actions bot commented Oct 27, 2023 • edited Loading

Test Results

quiet-node Oct 28, 2023

Choose a reason for hiding this comment

Nana-EC left a comment

Choose a reason for hiding this comment

stefan-stefanooov commented Nov 1, 2023 • edited Loading

Nana-EC left a comment

Choose a reason for hiding this comment

Nana-EC Nov 3, 2023

Choose a reason for hiding this comment

Nana-EC Nov 3, 2023

Choose a reason for hiding this comment

Nana-EC Nov 3, 2023

Choose a reason for hiding this comment

quiet-node Nov 3, 2023

Choose a reason for hiding this comment

Nana-EC Nov 3, 2023

Choose a reason for hiding this comment

quiet-node commented Oct 27, 2023 •

edited

Loading

github-actions bot commented Oct 27, 2023 •

edited

Loading

stefan-stefanooov commented Nov 1, 2023 •

edited

Loading