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

Merged
merged 1 commit into from
Jan 25, 2024
Merged

upgrade v2.2 and related contracts to v0.8.19 and generate wrappers #11888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions contracts/scripts/native_solc_compile_all_automation
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@ compileContract automation/v2_1/KeeperRegistryLogicB2_1.sol
compileContract automation/v2_1/AutomationUtils2_1.sol
compileContract automation/interfaces/v2_1/IKeeperRegistryMaster.sol

compileContract automation/dev/v2_2/AutomationRegistrar2_2.sol
compileContract automation/dev/v2_2/AutomationRegistry2_2.sol
compileContract automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
compileContract automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
compileContract automation/dev/v2_2/AutomationUtils2_2.sol
compileContract automation/dev/interfaces/v2_2/IAutomationRegistryMaster.sol

compileContract automation/interfaces/ILogAutomation.sol
compileContract automation/AutomationForwarderLogic.sol
compileContract automation/testhelpers/LogTriggeredStreamsLookup.sol
Expand All @@ -85,3 +78,17 @@ compileContract tests/VerifiableLoadStreamsLookupUpkeep.sol
compileContract tests/VerifiableLoadLogTriggerUpkeep.sol
compileContract tests/AutomationConsumerBenchmark.sol
compileContract tests/StreamsLookupUpkeep.sol

SOLC_VERSION="0.8.19"

solc-select install $SOLC_VERSION
solc-select use $SOLC_VERSION
export SOLC_VERSION=$SOLC_VERSION

# v0.8.19
compileContract automation/dev/v2_2/AutomationRegistrar2_2.sol
compileContract automation/dev/v2_2/AutomationRegistry2_2.sol
compileContract automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
compileContract automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
compileContract automation/dev/v2_2/AutomationUtils2_2.sol
compileContract automation/dev/interfaces/v2_2/IAutomationRegistryMaster.sol
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/AutomationForwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity ^0.8.16;

import {IAutomationRegistryConsumer} from "./interfaces/IAutomationRegistryConsumer.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/AutomationForwarderLogic.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity ^0.8.16;

import {IAutomationRegistryConsumer} from "./interfaces/IAutomationRegistryConsumer.sol";
import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/Chainable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.16;
pragma solidity ^0.8.16;

/**
* @title Chainable - the contract size limit nullifier
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/test/AutomationRegistry2_2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {AutomationForwarderLogic} from "../../AutomationForwarderLogic.sol";
import {BaseTest} from "./BaseTest.t.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/test/BaseTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import "forge-std/Test.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
import {IAutomationRegistryMaster} from "../interfaces/v2_2/IAutomationRegistryMaster.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/automation/dev/v2_2/AutomationUtils2_2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.16;
pragma solidity 0.8.19;

import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
import {Log} from "../../interfaces/ILogAutomation.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

'AutomationForwarderLogic bytecode has changed',
)
})
Expand Down
2 changes: 1 addition & 1 deletion ...gethwrappers/generated/automation_registrar_wrapper2_2/automation_registrar_wrapper2_2.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/gethwrappers/generated/automation_utils_2_2/automation_utils_2_2.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...pers/generated/keeper_registry_logic_a_wrapper_2_2/keeper_registry_logic_a_wrapper_2_2.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...pers/generated/keeper_registry_logic_b_wrapper_2_2/keeper_registry_logic_b_wrapper_2_2.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/gethwrappers/generated/keeper_registry_wrapper_2_2/keeper_registry_wrapper_2_2.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading