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.

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 v2.2 and related contracts to v0.8.19 and generate wrappers #11888

Merged
merged 1 commit into from
Jan 25, 2024

Conversation

shileiwill
Copy link
Contributor

@shileiwill shileiwill commented Jan 25, 2024

Upgrade the Registry, Registrar, and unlock any necessary dependancies (ex the forwarder and forwarder logic will probably need to be unlocked)

Also re-generate the go wrappers

contracts/src/v0.8/automation/AutomationForwarder.sol and Chainable.sol are shared btw v2.1 and v2.2 hence using a version range.

Test plan:

  1. pnpm hardhat test test/v0.8/automation/AutomationRegistry2_2.test.ts all tests passed.
  2. pnpm ts-node ./scripts/generate-automation-master-interface.ts nothing changed.
  3. go generate core/gethwrappers/go_generate.go some wrappers regenerated.
  4. Run foundry test under /contracts/src/v0.8/automation/dev/test, forge test, all compile.

Copy link
Contributor

I see that you haven't updated any CHANGELOG files. Would it make sense to do so?

@shileiwill shileiwill marked this pull request as ready for review January 25, 2024 00:24
@shileiwill shileiwill requested a review from a team as a code owner January 25, 2024 00:24
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity >=0.8.16 <=0.8.19;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove the upper bound? I think this would suffice...

pragma solidity ^0.8.16;

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.16;
pragma solidity >=0.8.16 <=0.8.19;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment

@shileiwill
Copy link
Contributor Author

shileiwill commented Jan 25, 2024

Updated the rebased the PR.

@shileiwill shileiwill marked this pull request as ready for review January 25, 2024 19:54
@shileiwill shileiwill requested a review from RyanRHall January 25, 2024 19:54
@FelixFan1992
Copy link
Contributor

you need to update the foundry test version too. for the registry 2.2

@shileiwill
Copy link
Contributor Author

you need to update the foundry test version too. for the registry 2.2

Yes, just updated. I think they are recently added so I missed them yesterday.

@@ -79,7 +79,7 @@ describe('KeeperRegistry2_1 - Frozen [ @skip-coverage ]', () => {
)
assert.equal(
ethers.utils.id(AutomationForwarderLogicFactory.bytecode),
'0x195e2d7ecc26c75206820a5d3bd16e3a0214dc9764cc335f5d2c457cda90fe84',
'0x6b89065111e9236407329fae3d68b33c311b7d3b6c2ae3dd15c1691a28b1aca7',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RyanRHall @FelixFan1992 I updated this hex in this v21 test case, this changed after I bumped up the AutomationForwarderLogicFactory solidity version.

@cl-sonarqube-production
Copy link

SonarQube Quality Gate

Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@shileiwill shileiwill added this pull request to the merge queue Jan 25, 2024
Merged via the queue into develop with commit a9e27b0 Jan 25, 2024
105 checks passed
@shileiwill shileiwill deleted the AUTO-8848 branch January 25, 2024 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants