Merge branch 'develop' into chore/VRF-858-rename-packages

contracts/scripts/generate-automation-master-interface.ts

@@ -2,9 +2,9 @@
  * @description this script generates a master interface for interacting with the automation registry
  * @notice run this script with pnpm ts-node ./scripts/generate-automation-master-interface.ts
  */
-import { KeeperRegistry2_2__factory as KeeperRegistry } from '../typechain/factories/KeeperRegistry2_2__factory'
-import { KeeperRegistryLogicA2_2__factory as KeeperRegistryLogicA } from '../typechain/factories/KeeperRegistryLogicA2_2__factory'
-import { KeeperRegistryLogicB2_2__factory as KeeperRegistryLogicB } from '../typechain/factories/KeeperRegistryLogicB2_2__factory'
+import { AutomationRegistry2_2__factory as Registry } from '../typechain/factories/AutomationRegistry2_2__factory'
+import { AutomationRegistryLogicA2_2__factory as RegistryLogicA } from '../typechain/factories/AutomationRegistryLogicA2_2__factory'
+import { AutomationRegistryLogicB2_2__factory as RegistryLogicB } from '../typechain/factories/AutomationRegistryLogicB2_2__factory'
 import { utils } from 'ethers'
 import fs from 'fs'
 import { exec } from 'child_process'
@@ -15,11 +15,7 @@ const tmpDest = `${dest}/tmp.txt`
 
 const combinedABI = []
 const abiSet = new Set()
-const abis = [
-  KeeperRegistry.abi,
-  KeeperRegistryLogicA.abi,
-  KeeperRegistryLogicB.abi,
-]
+const abis = [Registry.abi, RegistryLogicA.abi, RegistryLogicB.abi]
 
 for (const abi of abis) {
   for (const entry of abi) {

contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol

@@ -740,7 +740,7 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner, ExecutionPreventi
       if (!_validateConditionalTrigger(upkeepId, rawTrigger, transmitInfo)) return (false, dedupID);
     } else if (transmitInfo.triggerType == Trigger.LOG) {
       bool valid;
-      (valid, dedupID) = _validateLogTrigger(upkeepId, rawTrigger, transmitInfo);
+      (valid, dedupID) = _validateLogTrigger(upkeepId, rawTrigger);
       if (!valid) return (false, dedupID);
     } else {
       revert InvalidTriggerType();
@@ -789,11 +789,7 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner, ExecutionPreventi
     return true;
   }
 
-  function _validateLogTrigger(
-    uint256 upkeepId,
-    bytes memory rawTrigger,
-    UpkeepTransmitInfo memory transmitInfo
-  ) internal returns (bool, bytes32) {
+  function _validateLogTrigger(uint256 upkeepId, bytes memory rawTrigger) internal returns (bool, bytes32) {
     LogTrigger memory trigger = abi.decode(rawTrigger, (LogTrigger));
     bytes32 dedupID = keccak256(abi.encodePacked(upkeepId, trigger.logBlockHash, trigger.txHash, trigger.logIndex));
     if (

contracts/test/v0.8/automation/AutomationRegistry2_2.test.ts

@@ -34,17 +34,17 @@ import { UpkeepTranscoder } from '../../../typechain/UpkeepTranscoder'
 import { UpkeepAutoFunder } from '../../../typechain'
 import {
   CancelledUpkeepReportEvent,
-  IKeeperRegistryMaster as IKeeperRegistry,
+  IAutomationRegistryMaster as IAutomationRegistry,
   InsufficientFundsUpkeepReportEvent,
   ReorgedUpkeepReportEvent,
   StaleUpkeepReportEvent,
   UpkeepPerformedEvent,
-} from '../../../typechain/IKeeperRegistryMaster'
+} from '../../../typechain/IAutomationRegistryMaster'
 import {
   deployMockContract,
   MockContract,
 } from '@ethereum-waffle/mock-contract'
-import { deployRegistry21 } from './helpers'
+import { deployRegistry22 } from './helpers'
 
 const describeMaybe = process.env.SKIP_SLOW ? describe.skip : describe
 const itMaybe = process.env.SKIP_SLOW ? it.skip : it
@@ -70,7 +70,7 @@ enum Mode {
   OPTIMISM,
 }
 
-// copied from KeeperRegistryBase2_2.sol
+// copied from AutomationRegistryBase2_2.sol
 enum Trigger {
   CONDITION,
   LOG,
@@ -149,11 +149,11 @@ let personas: Personas
 let linkToken: Contract
 let linkEthFeed: MockV3Aggregator
 let gasPriceFeed: MockV3Aggregator
-let registry: IKeeperRegistry // default registry, used for most tests
-let arbRegistry: IKeeperRegistry // arbitrum registry
-let opRegistry: IKeeperRegistry // optimism registry
-let mgRegistry: IKeeperRegistry // "migrate registry" used in migration tests
-let blankRegistry: IKeeperRegistry // used to test initial configurations
+let registry: IAutomationRegistry // default registry, used for most tests
+let arbRegistry: IAutomationRegistry // arbitrum registry
+let opRegistry: IAutomationRegistry // optimism registry
+let mgRegistry: IAutomationRegistry // "migrate registry" used in migration tests
+let blankRegistry: IAutomationRegistry // used to test initial configurations
 let mock: UpkeepMock
 let autoFunderUpkeep: UpkeepAutoFunder
 let ltUpkeep: MockContract
@@ -388,7 +388,7 @@ const parseCancelledUpkeepReportLogs = (receipt: ContractReceipt) => {
   return parsedLogs
 }
 
-describe('KeeperRegistry2_2', () => {
+describe('AutomationRegistry2_2', () => {
   let owner: Signer
   let keeper1: Signer
   let keeper2: Signer
@@ -418,7 +418,7 @@ describe('KeeperRegistry2_2', () => {
   let signers: Wallet[]
   let signerAddresses: string[]
   let config: any
-  let baseConfig: Parameters<IKeeperRegistry['setConfig']>
+  let baseConfig: Parameters<IAutomationRegistry['setConfig']>
   let upkeepManager: string
 
   before(async () => {
@@ -564,7 +564,7 @@ describe('KeeperRegistry2_2', () => {
   }
 
   const verifyMaxPayment = async (
-    registry: IKeeperRegistry,
+    registry: IAutomationRegistry,
     l1CostWei?: BigNumber,
   ) => {
     type TestCase = {
@@ -708,7 +708,7 @@ describe('KeeperRegistry2_2', () => {
   }
 
   const getTransmitTx = async (
-    registry: IKeeperRegistry,
+    registry: IAutomationRegistry,
     transmitter: Signer,
     upkeepIds: BigNumber[],
     overrides: GetTransmitTXOptions = {},
@@ -794,7 +794,7 @@ describe('KeeperRegistry2_2', () => {
   }
 
   const getTransmitTxWithReport = async (
-    registry: IKeeperRegistry,
+    registry: IAutomationRegistry,
     transmitter: Signer,
     report: BytesLike,
   ) => {
@@ -891,39 +891,39 @@ describe('KeeperRegistry2_2', () => {
       offchainBytes,
     ]
 
-    registry = await deployRegistry21(
+    registry = await deployRegistry22(
       owner,
       Mode.DEFAULT,
       linkToken.address,
       linkEthFeed.address,
       gasPriceFeed.address,
     )
 
-    arbRegistry = await deployRegistry21(
+    arbRegistry = await deployRegistry22(
       owner,
       Mode.ARBITRUM,
       linkToken.address,
       linkEthFeed.address,
       gasPriceFeed.address,
     )
 
-    opRegistry = await deployRegistry21(
+    opRegistry = await deployRegistry22(
       owner,
       Mode.OPTIMISM,
       linkToken.address,
       linkEthFeed.address,
       gasPriceFeed.address,
     )
 
-    mgRegistry = await deployRegistry21(
+    mgRegistry = await deployRegistry22(
       owner,
       Mode.DEFAULT,
       linkToken.address,
       linkEthFeed.address,
       gasPriceFeed.address,
     )
 
-    blankRegistry = await deployRegistry21(
+    blankRegistry = await deployRegistry22(
       owner,
       Mode.DEFAULT,
       linkToken.address,
@@ -3453,7 +3453,7 @@ describe('KeeperRegistry2_2', () => {
   describe('#typeAndVersion', () => {
     it('uses the correct type and version', async () => {
       const typeAndVersion = await registry.typeAndVersion()
-      assert.equal(typeAndVersion, 'KeeperRegistry 2.1.0')
+      assert.equal(typeAndVersion, 'AutomationRegistry 2.2.0')
     })
   })
 

contracts/test/v0.8/automation/helpers.ts

@@ -3,6 +3,9 @@ import { ethers } from 'hardhat'
 import { KeeperRegistryLogicB2_1__factory as KeeperRegistryLogicBFactory } from '../../../typechain/factories/KeeperRegistryLogicB2_1__factory'
 import { IKeeperRegistryMaster as IKeeperRegistry } from '../../../typechain/IKeeperRegistryMaster'
 import { IKeeperRegistryMaster__factory as IKeeperRegistryMasterFactory } from '../../../typechain/factories/IKeeperRegistryMaster__factory'
+import { AutomationRegistryLogicB2_2__factory as AutomationRegistryLogicBFactory } from '../../../typechain/factories/AutomationRegistryLogicB2_2__factory'
+import { IAutomationRegistryMaster as IAutomationRegistry } from '../../../typechain/IAutomationRegistryMaster'
+import { IAutomationRegistryMaster__factory as IAutomationRegistryMasterFactory } from '../../../typechain/factories/IAutomationRegistryMaster__factory'
 
 export const deployRegistry21 = async (
   from: Signer,
@@ -29,3 +32,31 @@ export const deployRegistry21 = async (
   const master = await registryFactory.connect(from).deploy(logicA.address)
   return IKeeperRegistryMasterFactory.connect(master.address, from)
 }
+
+export const deployRegistry22 = async (
+  from: Signer,
+  mode: Parameters<AutomationRegistryLogicBFactory['deploy']>[0],
+  link: Parameters<AutomationRegistryLogicBFactory['deploy']>[1],
+  linkNative: Parameters<AutomationRegistryLogicBFactory['deploy']>[2],
+  fastgas: Parameters<AutomationRegistryLogicBFactory['deploy']>[3],
+): Promise<IAutomationRegistry> => {
+  const logicBFactory = await ethers.getContractFactory(
+    'AutomationRegistryLogicB2_2',
+  )
+  const logicAFactory = await ethers.getContractFactory(
+    'AutomationRegistryLogicA2_2',
+  )
+  const registryFactory = await ethers.getContractFactory(
+    'AutomationRegistry2_2',
+  )
+  const forwarderLogicFactory = await ethers.getContractFactory(
+    'AutomationForwarderLogic',
+  )
+  const forwarderLogic = await forwarderLogicFactory.connect(from).deploy()
+  const logicB = await logicBFactory
+    .connect(from)
+    .deploy(mode, link, linkNative, fastgas, forwarderLogic.address)
+  const logicA = await logicAFactory.connect(from).deploy(logicB.address)
+  const master = await registryFactory.connect(from).deploy(logicA.address)
+  return IAutomationRegistryMasterFactory.connect(master.address, from)
+}