foundry test setup

contracts/foundry.toml

@@ -22,6 +22,10 @@ src = 'src/v0.8/functions/dev/v1_X'
 test = 'src/v0.8/functions/tests/v1_X'
 gas_price = 3_000_000_000 # 3 gwei
 
+[profile.automationexp]
+auto_detect_solc = true
+src = 'src/v0.8/automation/'
+
 [profile.vrf]
 optimizer_runs = 1000
 src = 'src/v0.8/vrf'

contracts/hardhat.config.ts

@@ -56,6 +56,9 @@ let config = {
       ),
       hardfork: 'merge',
     },
+    optimism_goerli: {
+      url: 'https://op.getblock.io/608a6708-d787-4ba8-bcbd-493001ea7fd9/goerli/',
+    },
   },
   solidity: {
     compilers: [
@@ -141,6 +144,16 @@ if (process.env.NETWORK_NAME && process.env.EXPLORER_API_KEY) {
       apiKey: {
         [process.env.NETWORK_NAME]: process.env.EXPLORER_API_KEY,
       },
+      customChains: [
+        {
+          network: 'optimism_goerli',
+          chainId: 420,
+          urls: {
+            apiURL: 'https://api-goerli-optimistic.etherscan.io/api',
+            browserURL: 'https://goerli-optimism.etherscan.io/',
+          },
+        },
+      ],
     },
   }
 }

contracts/remappings.txt

@@ -1,6 +1,6 @@
 ds-test/=foundry-lib/forge-std/lib/ds-test/src
 forge-std/=foundry-lib/forge-std/src
 
-@openzeppelin/=node_modules/@openzeppelin/
+@openzeppelin/=src/v0.8/vendor/openzeppelin-solidity/v4.9.3
 hardhat/=node_modules/hardhat/
 @eth-optimism/=node_modules/@eth-optimism

contracts/src/v0.8/automation/libraries/external/Cron.sol → contracts/src/v0.8/automation/libraries/external/ECron.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.8.6;
 
-import {Cron as CronInternal, Spec} from "../internal/Cron.sol";
+import {ICron as CronInternal, Spec} from "../internal/ICron.sol";
 
 /**
  * @title The Cron library
@@ -10,7 +10,7 @@ import {Cron as CronInternal, Spec} from "../internal/Cron.sol";
  * @dev this is the external version of the library, which relies on the internal library
  * by the same name.
  */
-library Cron {
+library ECron {
   using CronInternal for Spec;
   using CronInternal for string;
 

contracts/src/v0.8/automation/libraries/internal/Cron.sol → contracts/src/v0.8/automation/libraries/internal/ICron.sol

@@ -84,7 +84,7 @@ struct Field {
  * abstraction called a Spec. The library also includes a spec function, nextTick(), which
  * determines the next time a cron job should fire based on the current block timestamp.
  */
-library Cron {
+library ICron {
   using strings for *;
 
   /**

contracts/src/v0.8/automation/testhelpers/CronTestHelper.sol

@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.6;
 
-import {Cron as CronInternal, Spec} from "../libraries/internal/Cron.sol";
-import {Cron as CronExternal} from "../libraries/external/Cron.sol";
+import {ICron as CronInternal, Spec} from "../libraries/internal/ICron.sol";
+import {ECron as CronExternal} from "../libraries/external/ECron.sol";
 
 /**
  * @title The CronInternalTestHelper contract

contracts/src/v0.8/automation/testhelpers/CronUpkeepTestHelper.sol

@@ -3,16 +3,16 @@
 pragma solidity 0.8.6;
 
 import "../upkeeps/CronUpkeep.sol";
-import {Cron, Spec} from "../libraries/internal/Cron.sol";
+import {ICron, Spec} from "../libraries/internal/ICron.sol";
 
 /**
  * @title The CronUpkeepTestHelper contract
  * @notice This contract exposes core functionality of the CronUpkeep contract.
  * It is only intended for use in tests.
  */
 contract CronUpkeepTestHelper is CronUpkeep {
-  using Cron for Spec;
-  using Cron for string;
+  using ICron for Spec;
+  using ICron for string;
 
   constructor(
     address owner,

contracts/src/v0.8/automation/upkeeps/CronUpkeep.sol

@@ -24,8 +24,8 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "../../shared/access/ConfirmedOwner.sol";
 import "../KeeperBase.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
-import {Cron as CronInternal, Spec} from "../libraries/internal/Cron.sol";
-import {Cron as CronExternal} from "../libraries/external/Cron.sol";
+import {ICron as CronInternal, Spec} from "../libraries/internal/ICron.sol";
+import {ECron as CronExternal} from "../libraries/external/ECron.sol";
 
 /**
  * @title The CronUpkeep contract

contracts/src/v0.8/automation/upkeeps/CronUpkeepDelegate.sol

@@ -3,7 +3,7 @@
 pragma solidity 0.8.6;
 
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import {Cron, Spec} from "../libraries/internal/Cron.sol";
+import {ICron, Spec} from "../libraries/internal/ICron.sol";
 
 /**
  * @title The CronUpkeepDelegate contract
@@ -13,7 +13,7 @@ import {Cron, Spec} from "../libraries/internal/Cron.sol";
  */
 contract CronUpkeepDelegate {
   using EnumerableSet for EnumerableSet.UintSet;
-  using Cron for Spec;
+  using ICron for Spec;
 
   address private s_owner; // from ConfirmedOwner
   address private s_delegate;

contracts/src/v0.8/automation/upkeeps/CronUpkeepFactory.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.6;
 import "./CronUpkeep.sol";
 import "./CronUpkeepDelegate.sol";
 import "../../shared/access/ConfirmedOwner.sol";
-import {Spec, Cron as CronExternal} from "../libraries/external/Cron.sol";
+import {Spec, ECron as CronExternal} from "../libraries/external/ECron.sol";
 
 /**
  * @title The CronUpkeepFactory contract