upgrade to new version (#11888)

smartcontractkit · Jan 25, 2024 · a9e27b0 · a9e27b0
1 parent e20511d
commit a9e27b0
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 36 deletions.
diff --git a/contracts/scripts/native_solc_compile_all_automation b/contracts/scripts/native_solc_compile_all_automation
@@ -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
@@ -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
diff --git a/contracts/src/v0.8/automation/AutomationForwarder.sol b/contracts/src/v0.8/automation/AutomationForwarder.sol
@@ -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";
 

diff --git a/contracts/src/v0.8/automation/AutomationForwarderLogic.sol b/contracts/src/v0.8/automation/AutomationForwarderLogic.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/Chainable.sol b/contracts/src/v0.8/automation/Chainable.sol
@@ -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

diff --git a/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_2.t.sol b/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_2.t.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/test/BaseTest.t.sol b/contracts/src/v0.8/automation/dev/test/BaseTest.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.16;
+pragma solidity 0.8.19;
 
 import "forge-std/Test.sol";
 

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicA2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicB2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
@@ -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";

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationUtils2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationUtils2_2.sol
@@ -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";

diff --git a/contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts b/contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts
@@ -79,7 +79,7 @@ describe('KeeperRegistry2_1 - Frozen [ @skip-coverage ]', () => {
     )
     assert.equal(
       ethers.utils.id(AutomationForwarderLogicFactory.bytecode),
-      '0x195e2d7ecc26c75206820a5d3bd16e3a0214dc9764cc335f5d2c457cda90fe84',
+      '0x6b89065111e9236407329fae3d68b33c311b7d3b6c2ae3dd15c1691a28b1aca7',
       'AutomationForwarderLogic bytecode has changed',
     )
   })

diff --git a/...gethwrappers/generated/automation_registrar_wrapper2_2/automation_registrar_wrapper2_2.go b/...gethwrappers/generated/automation_registrar_wrapper2_2/automation_registrar_wrapper2_2.go
diff --git a/core/gethwrappers/generated/automation_utils_2_2/automation_utils_2_2.go b/core/gethwrappers/generated/automation_utils_2_2/automation_utils_2_2.go
diff --git a/...pers/generated/keeper_registry_logic_a_wrapper_2_2/keeper_registry_logic_a_wrapper_2_2.go b/...pers/generated/keeper_registry_logic_a_wrapper_2_2/keeper_registry_logic_a_wrapper_2_2.go
diff --git a/...pers/generated/keeper_registry_logic_b_wrapper_2_2/keeper_registry_logic_b_wrapper_2_2.go b/...pers/generated/keeper_registry_logic_b_wrapper_2_2/keeper_registry_logic_b_wrapper_2_2.go
diff --git a/core/gethwrappers/generated/keeper_registry_wrapper_2_2/keeper_registry_wrapper_2_2.go b/core/gethwrappers/generated/keeper_registry_wrapper_2_2/keeper_registry_wrapper_2_2.go